155880 2016-03-25 05:06:07 -0700 Removed redundant #if conditions in ANGLEWebKitBridge.h 2016-03-27 23:47:39 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annulen webkit-unassigned achristensen commit-queue dino gyuyoung.kim kondapallykalyan mcatanzaro ossy roger_fong oldest_to_newest 1177930 0 annulen 2016-03-25 05:06:07 -0700 GTK and Efl ports can be built only with cmake, so condition !defined(BUILDING_WITH_CMAKE) implies !PLATFORM(GTK) && !PLATFORM(EFL). 1177931 1 274899 annulen 2016-03-25 05:07:43 -0700 Created attachment 274899 Patch 1177939 2 274899 ossy 2016-03-25 06:23:39 -0700 Comment on attachment 274899 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=274899&action=review > Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:49 > -#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) > +#if !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) > #include "ANGLE/ShaderLang.h" > #elif PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) > #include "GLSLANG/ShaderLang.h" These conditions are very confusing. PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) is an always false condition, Apple Windows port and WinCairo port always use cmake. Shouldn't we include ANGLE/ShaderLang.h unconditionally? 1177944 3 annulen 2016-03-25 06:33:03 -0700 (In reply to comment #2) > These conditions are very confusing. > PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) is an always false > condition, Apple Windows port and WinCairo port always use cmake. Indeed. > > Shouldn't we include ANGLE/ShaderLang.h unconditionally? Yes. 1177971 4 274899 achristensen 2016-03-25 08:39:34 -0700 Comment on attachment 274899 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=274899&action=review >> Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:49 >> #include "GLSLANG/ShaderLang.h" > > These conditions are very confusing. > PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE) is an always false > condition, Apple Windows port and WinCairo port always use cmake. > > Shouldn't we include ANGLE/ShaderLang.h unconditionally? This was needed before the switch to CMake on Windows. It's not needed any more. Let's clean it up. 1178296 5 274988 annulen 2016-03-26 13:13:53 -0700 Created attachment 274988 Patch 1178391 6 274988 commit-queue 2016-03-27 23:47:35 -0700 Comment on attachment 274988 Patch Clearing flags on attachment: 274988 Committed r198729: <http://trac.webkit.org/changeset/198729> 1178392 7 commit-queue 2016-03-27 23:47:39 -0700 All reviewed patches have been landed. Closing bug. 274899 2016-03-25 05:07:43 -0700 2016-03-26 13:13:44 -0700 Patch bug-155880-20160325150745.patch text/plain 1442 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmUxNWFlNTNmMjhiYzdl NzEzMWVkODE2MDY2ODAyZjcyY2U3NWZkMi4uZWFjNGZkZGVmODBkZGE3NjViYWIxNTBiOTk5M2Jk NjNkNzI3YWM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTAzLTI1ICBLb25z dGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBSZW1vdmVkIHJl ZHVuZGFudCAjaWYgY29uZGl0aW9ucyBpbiBBTkdMRVdlYktpdEJyaWRnZS5oCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU4ODAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHVEsgYW5kIEVmbCBwb3J0cyBj YW4gYmUgYnVpbHQgb25seSB3aXRoIGNtYWtlLCBzbyBjb25kaXRpb24KKyAgICAgICAgIWRlZmlu ZWQoQlVJTERJTkdfV0lUSF9DTUFLRSkgaW1wbGllcyAhUExBVEZPUk0oR1RLKSAmJiAhUExBVEZP Uk0oRUZMKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvQU5HTEVXZWJLaXRCcmlkZ2UuaDoKKwogMjAxNi0wMy0yNCAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBNYWMg Q01ha2UgYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9BTkdMRVdlYktpdEJyaWRnZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv QU5HTEVXZWJLaXRCcmlkZ2UuaAppbmRleCBkMWYwNDMxODRlN2YyNDljZWU0OTNmODBmZWIwMWRk ZjAyNDdlOGM3Li5mMjg2MjFlNGM2Y2FhZWIxYjBjZGU3ZGE1YmRmY2UyZjIyY2QyMGUyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9BTkdMRVdlYktpdEJyaWRn ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0FOR0xFV2ViS2l0QnJp ZGdlLmgKQEAgLTQzLDcgKzQzLDcgQEAKICNlbmRpZgogI2VuZGlmCiAKLSNpZiAhUExBVEZPUk0o R1RLKSAmJiAhUExBVEZPUk0oRUZMKSAmJiAhUExBVEZPUk0oV0lOKSAmJiAhZGVmaW5lZChCVUlM RElOR19XSVRIX0NNQUtFKQorI2lmICFQTEFURk9STShXSU4pICYmICFkZWZpbmVkKEJVSUxESU5H X1dJVEhfQ01BS0UpCiAjaW5jbHVkZSAiQU5HTEUvU2hhZGVyTGFuZy5oIgogI2VsaWYgUExBVEZP Uk0oV0lOKSAmJiAhZGVmaW5lZChCVUlMRElOR19XSVRIX0NNQUtFKQogI2luY2x1ZGUgIkdMU0xB TkcvU2hhZGVyTGFuZy5oIgo= 274988 2016-03-26 13:13:53 -0700 2016-03-27 23:47:35 -0700 Patch bug-155880-20160326231355.patch text/plain 1730 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2EzNTE1NDc1MGM0NzRl NzgwNGI0N2E5ZmVkMmE2Zjk0MzViZWJjMi4uNzk5ZDhmZGYxOWIyMTNiZWIyOTlhOWVlOTI3MzI4 MmMyMDhmNGNmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTAzLTI1ICBLb25z dGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBSZW1vdmVkIHJl ZHVuZGFudCAjaWYgY29uZGl0aW9ucyBpbiBBTkdMRVdlYktpdEJyaWRnZS5oCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU4ODAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHVEssIEVmbCwgQXBwbGVXaW4s IGFuZCBXaW5DYWlybyBwb3J0cyBjYW4gYmUgYnVpbHQgb25seSB3aXRoIGNtYWtlLAorICAgICAg ICBzbyBjb25kaXRpb24gIWRlZmluZWQoQlVJTERJTkdfV0lUSF9DTUFLRSkgaW1wbGllcworICAg ICAgICAhUExBVEZPUk0oR1RLKSAmJiAhUExBVEZPUk0oRUZMKSAmJiAhUExBVE9GUk0oV0lOKS4K KworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvQU5HTEVXZWJLaXRCcmlkZ2UuaDoKKwogMjAxNi0wMy0yNSAgWW91ZW5uIEZhYmxldCAg PHlvdWVubi5mYWJsZXRAY3JmLmNhbm9uLmZyPgogCiAgICAgICAgIFtGZXRjaCBBUEldIEFkZCBi YXNpYyBsb2FkaW5nIG9mIHJlc291cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvQU5HTEVXZWJLaXRCcmlkZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0FOR0xFV2ViS2l0QnJpZGdlLmgKaW5kZXggZDFmMDQzMTg0ZTdmMjQ5Y2Vl NDkzZjgwZmViMDFkZGYwMjQ3ZThjNy4uNmYwMGI0ZGFlNDY3MjQxYjIwMGQwZTZlMGQ2ZjhmYWYw ZDY0NmQ3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQU5H TEVXZWJLaXRCcmlkZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9B TkdMRVdlYktpdEJyaWRnZS5oCkBAIC0yNiw2ICsyNiw3IEBACiAjaWZuZGVmIEFOR0xFV2ViS2l0 QnJpZGdlX2gKICNkZWZpbmUgQU5HTEVXZWJLaXRCcmlkZ2VfaAogCisjaW5jbHVkZSA8QU5HTEUv U2hhZGVyTGFuZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNDMsMTQgKzQ0LDYgQEAKICNlbmRpZgogI2VuZGlm CiAKLSNpZiAhUExBVEZPUk0oR1RLKSAmJiAhUExBVEZPUk0oRUZMKSAmJiAhUExBVEZPUk0oV0lO KSAmJiAhZGVmaW5lZChCVUlMRElOR19XSVRIX0NNQUtFKQotI2luY2x1ZGUgIkFOR0xFL1NoYWRl ckxhbmcuaCIKLSNlbGlmIFBMQVRGT1JNKFdJTikgJiYgIWRlZmluZWQoQlVJTERJTkdfV0lUSF9D TUFLRSkKLSNpbmNsdWRlICJHTFNMQU5HL1NoYWRlckxhbmcuaCIKLSNlbHNlCi0jaW5jbHVkZSA8 QU5HTEUvU2hhZGVyTGFuZy5oPgotI2VuZGlmCi0KIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogZW51 bSBBTkdMRVNoYWRlclR5cGUgewo=