142530 2015-03-10 04:44:53 -0700 [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers 2015-03-17 11:04:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 138562 1 zan zan achristensen bfulgham cgarcia commit-queue darin jdapena mrobinson ossy peavo pnormand oldest_to_newest 1075944 0 zan 2015-03-10 04:44:53 -0700 [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers 1075946 1 248328 zan 2015-03-10 04:55:43 -0700 Created attachment 248328 Patch 1075947 2 zan 2015-03-10 04:58:43 -0700 I don't think this is 100% correct for the Windows port, I'll have to ask around about that. 1075948 3 commit-queue 2015-03-10 04:58:57 -0700 Attachment 248328 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:37: "ANGLE/ShaderLang.h" already included at Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:33 [build/include] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1075974 4 248328 darin 2015-03-10 09:57:16 -0700 Comment on attachment 248328 Patch OK. 1077834 5 248328 zan 2015-03-17 02:46:29 -0700 Comment on attachment 248328 Patch Clearing flags on attachment: 248328 Committed r181629: <http://trac.webkit.org/changeset/181629> 1077835 6 zan 2015-03-17 02:46:38 -0700 All reviewed patches have been landed. Closing bug. 1077904 7 ossy 2015-03-17 09:43:43 -0700 (In reply to comment #5) > Comment on attachment 248328 [details] > Patch > > Clearing flags on attachment: 248328 > > Committed r181629: <http://trac.webkit.org/changeset/181629> It broke the WinCairo build: ..\platform\graphics\cairo\GraphicsContext3DCairo.cpp(42): fatal error C1083: Cannot open include file: 'ANGLE/ShaderLang.h': No such file or directory [C:\cygwin\home\webkitbot\win-cairo-release\build\Source\WebCore\WebCore.vcxproj\WebCore.vcxproj] cc-ing WinCairo maintainers 1077912 8 achristensen 2015-03-17 11:04:17 -0700 Fixed in http://trac.webkit.org/changeset/181653 248328 2015-03-10 04:55:43 -0700 2015-03-17 02:46:29 -0700 Patch bug-142530-20150310045816.patch text/plain 5974 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxMzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggMzE3ZWQ0MjkxNGYwNzNiMTQ3NzViMTQ4MDAxMGYwMTM4NTJlZjAzZi4uNGM3OWVjNDIzYTBj MjkyZDBmMjYxOWRiNDc5Yjg2OWQ3NDI4NGZhNiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEzIEBACisyMDE1LTAzLTEwICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtA aWdhbGlhLmNvbT4KKworICAgICAgICBbQ01ha2VdIFVzZSBhIGZvcndhcmRpbmcgaGVhZGVyIGZv ciBBTkdMRSdzIFNoYWRlckxhbmcuaCB0byBhdm9pZCBwaWNraW5nIHVwIEFOR0xFJ3MgRUdMIGhl YWRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 MjUzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog QU5HTEUvU2hhZGVyTGFuZy5oOiBBZGRlZC4gSW5jbHVkZXMgaW5jbHVkZS9HTFNMQU5HL1NoYWRl ckxhbmcuaC4gVXNlZCBpbiBXZWJDb3JlCisgICAgICAgIHNvIHdlIGNhbiBhdm9pZCB1c2luZyBB TkdMRSdzIEVHTCBoZWFkZXJzIGFuZCB1c2UgdGhlIHN5c3RlbS1kZWZhdWx0IGhlYWRlcnMgaW5z dGVhZC4KKwogMjAxNS0wMi0yMCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgc3ZuOmtleXdvcmRzIHByb3BlcnR5LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDc0 YjhlOWZlZmY1NjExN2IyMDY3M2M5MmY5OTI3NDk1MTg5ZmQ5YzguLjliZTM1OGY4M2ZhMjFkMDRj ZTk3ZWI3ODBhZDI3MTMzMmFmMGQ2NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNSBAQAogMjAx NS0wMy0xMCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKKyAgICAgICAg W0NNYWtlXSBVc2UgYSBmb3J3YXJkaW5nIGhlYWRlciBmb3IgQU5HTEUncyBTaGFkZXJMYW5nLmgg dG8gYXZvaWQgcGlja2luZyB1cCBBTkdMRSdzIEVHTCBoZWFkZXJzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1MzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbmNsdWRlIHRoZSBBTkdMRSdzIFNoYWRl ckxhbmcuaCB0aHJvdWdoIHRoZSBuZXcgZm9yd2FyZGluZyBoZWFkZXIuIFRoaXMgYWxsb3dzCisg ICAgICAgIHVzIHRvIG5vdCBsaXN0IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUgaW4g dGhlIGxpc3Qgb2YgaW5jbHVzaW9uIGRpcmVjdG9yaWVzCisgICAgICAgIGFuZCB0aHVzIGF2b2lk IEFOR0xFJ3MgRUdMIGFuZCBHTEVTMi9HTEVTMyBoZWFkZXJzLCBkZWZhdWx0aW5nIHRvIHRoZSBz eXN0ZW0tcHJvdmlkZWQKKyAgICAgICAgaGVhZGVycyBpbnN0ZWFkLgorCisgICAgICAgIFNvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvS0hSIGlzIHN0aWxsIHVzZWQgYmVjYXVzZSBBTkdM RSdzIGtocnBsYXRmb3JtLmggaXMKKyAgICAgICAgcmVxdWlyZWQgYnkgdGhlIFNoYWRlckxhbmcu aCBoZWFkZXIuIFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYyBpcyBub3QgdXNlZCBmb3IgdGhl CisgICAgICAgIHdob2xlIFdlYkNvcmUgbGlicmFyeSBhbnltb3JlLCBvbmx5IHRoZSBBTkdMRVN1 cHBvcnQgbGlicmFyeS4KKworICAgICAgICAqIENNYWtlTGlzdHMudHh0OgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0FOR0xFV2ViS2l0QnJpZGdlLmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHA6CisKKzIwMTUtMDMtMTAg IFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCiAgICAgICAgIFNocmluayB0 aGUgQ1NTUHJvcGVydHlJRCBlbnVtIHR5cGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MjQ1NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDQzMWE4NjdlMTZlN2Uz N2U4NGQxMGFjYTlhYjhjMGM5M2NlN2IxNy4uODYxYzU4YzU4ZWJmZThmZDc1ZTcyY2EzMTNkODRk Y2FmMmNjNTVkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTAzLTEwICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQ01ha2VdIFVzZSBh IGZvcndhcmRpbmcgaGVhZGVyIGZvciBBTkdMRSdzIFNoYWRlckxhbmcuaCB0byBhdm9pZCBwaWNr aW5nIHVwIEFOR0xFJ3MgRUdMIGhlYWRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MjUzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6IFJlcGxhY2UgdGhlIFNvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvR0xTTEFORyBlbnRyeQorICAgICAgICBpbiB0aGUgbGlz dCBvZiBpbmNsdXNpb24gZGlyZWN0b3JpZXMgZm9yIFdlYktpdDIgd2l0aCBTb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRSwKKyAgICAgICAgcG9zc2libGUgZHVlIHRvIHRoZSBuZXcgZm9yd2FyZGluZyBo ZWFkZXIgZm9yIEFOR0xFJ3MgU2hhZGVyTGFuZy5oLgorCiAyMDE1LTAzLTEwICBDc2FiYSBPc3p0 cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW2NtYWtlXSBIYW5kbGUgdW51 c2VkIHBhcmFtZXRlciB3YXJuaW5ncyBhcyBidWlsZCBlcnJvcnMgZXhjZXB0IGluIFdlYktpdDIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0FOR0xFL1NoYWRlckxhbmcuaCBi L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0FOR0xFL1NoYWRlckxhbmcuaApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43 M2Y4ZWQ2M2Y3NGRkMDcwMWJhMzU3ZDkzMDE4ZDU2OWQ0N2JhNjkwCi0tLSAvZGV2L251bGwKKysr IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvQU5HTEUvU2hhZGVyTGFuZy5oCkBAIC0wLDAgKzEg QEAKKyNpbmNsdWRlICJpbmNsdWRlL0dMU0xBTkcvU2hhZGVyTGFuZy5oIgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQgYi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3Rz LnR4dAppbmRleCA2MzRhZmQwODA1ZjNlYzExNGE1YmQzZmZkMTAwMTYzNzcwNGJhMmRmLi4wNzM3 ZTEyNTNiZjRjZDY4YWMwMGEwM2RlOWJkODE1M2MyN2NjZTVkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4 dApAQCAtMjk3MywxMCArMjk3Myw4IEBAIGlmIChXVEZfVVNFXzNEX0dSQVBISUNTKQogICAgIGVu ZGlmICgpCiAKICAgICBsaXN0KEFQUEVORCBXZWJDb3JlX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAg ICAgICAgIiR7VEhJUkRQQVJUWV9ESVJ9L0FOR0xFL3NyYyIKLSAgICAgICAgIiR7VEhJUkRQQVJU WV9ESVJ9L0FOR0xFL2luY2x1ZGUvIgorICAgICAgICAiJHtUSElSRFBBUlRZX0RJUn0vQU5HTEUv IgogICAgICAgICAiJHtUSElSRFBBUlRZX0RJUn0vQU5HTEUvaW5jbHVkZS9LSFIiCi0gICAgICAg ICIke1RISVJEUEFSVFlfRElSfS9BTkdMRS9pbmNsdWRlL0dMU0xBTkciCiAgICAgICAgICIke1dF QkNPUkVfRElSfS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUiCiAgICAgKQogCkBAIC0zNTA1LDYgKzM1 MDMsNyBAQCBpZiAoV1RGX1VTRV8zRF9HUkFQSElDUykKICAgICAgICAgQVBQRU5ECiAgICAgICAg IFBST1BFUlRZIElOQ0xVREVfRElSRUNUT1JJRVMKICAgICAgICAgICAgICIke1RISVJEUEFSVFlf RElSfS9BTkdMRS9pbmNsdWRlIgorICAgICAgICAgICAgIiR7VEhJUkRQQVJUWV9ESVJ9L0FOR0xF L3NyYyIKICAgICApCiAgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMgQU5HTEVTdXBw b3J0KQogICAgIFdFQktJVF9TRVRfRVhUUkFfQ09NUElMRVJfRkxBR1MoQU5HTEVTdXBwb3J0IElH Tk9SRUNYWF9XQVJOSU5HUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0FOR0xFV2ViS2l0QnJpZGdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9BTkdMRVdlYktpdEJyaWRnZS5oCmluZGV4IGY3OWYwMzNlNTIzNTcwMmNlNDNlMWZiMjk4 ZjAzNGNhN2IwZDhhNDguLjg1YTM0YTM5OTJlYzc3ZmJmYTM5NmUzMTE5ZmFjNGI0YjRlY2Y5YTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0FOR0xFV2ViS2l0 QnJpZGdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQU5HTEVXZWJL aXRCcmlkZ2UuaApAQCAtMzQsNyArMzQsNyBAQAogI2VsaWYgUExBVEZPUk0oV0lOKQogI2luY2x1 ZGUgIkdMU0xBTkcvU2hhZGVyTGFuZy5oIgogI2Vsc2UKLSNpbmNsdWRlICJTaGFkZXJMYW5nLmgi CisjaW5jbHVkZSA8QU5HTEUvU2hhZGVyTGFuZy5oPgogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0dyYXBoaWNzQ29udGV4dDNEQ2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHAKaW5kZXggN2Q0OGJjMjc1N2Uw NTRlMjlhMGE3MzA4NmVhOTZjZjQ2Zjk0NmFmMC4uN2RjOThhMzUxZmFmMGI1NDBmNWQwZjM1NWRj MDJkNmFmMzc4MGJiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHAKQEAgLTM5 LDcgKzM5LDcgQEAKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIlBsYXRm b3JtQ29udGV4dENhaXJvLmgiCiAjaW5jbHVkZSAiUmVmUHRyQ2Fpcm8uaCIKLSNpbmNsdWRlIDxH TFNMQU5HL1NoYWRlckxhbmcuaD4KKyNpbmNsdWRlIDxBTkdMRS9TaGFkZXJMYW5nLmg+CiAjaW5j bHVkZSA8Y2Fpcm8uaD4KIAogI2lmIFVTRShPUEVOR0xfRVNfMikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYktpdDIvQ01ha2VMaXN0cy50eHQK aW5kZXggYjY1YWVlNjYyZjViZGM5ZmIzNmUzZmY3YTRiOTRkYWZlZGE2MDQ1Zi4uOGUzY2ZmZjZl NjE2ZWZhNzc4NjdhNGViMDI4ZTYzMDFhN2MxNWUzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvQ01ha2VMaXN0cy50eHQKQEAg LTE0OSw4ICsxNDksOCBAQCBzZXQoV2ViS2l0Ml9JTkNMVURFX0RJUkVDVE9SSUVTCiAKIGlmIChX VEZfVVNFXzNEX0dSQVBISUNTKQogICAgIGxpc3QoQVBQRU5EIFdlYktpdDJfSU5DTFVERV9ESVJF Q1RPUklFUworICAgICAgICAiJHtUSElSRFBBUlRZX0RJUn0vQU5HTEUiCiAgICAgICAgICIke1RI SVJEUEFSVFlfRElSfS9BTkdMRS9pbmNsdWRlL0tIUiIKLSAgICAgICAgIiR7VEhJUkRQQVJUWV9E SVJ9L0FOR0xFL2luY2x1ZGUvR0xTTEFORyIKICAgICApCiBlbmRpZiAoKQogCg==