184661 2018-04-16 13:16:15 -0700 Inconsistent EGL defines in ImageBufferCairo 2018-04-16 23:55:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Trivial --- 1 psaavedra webkit-unassigned calvaris commit-queue pnormand webkit-bug-importer zan oldest_to_newest 1414878 0 psaavedra 2018-04-16 13:16:15 -0700 On revision r219391 libepoxy is added. The headers in ImageBufferCairo.cpp become inconsistent when 2D canvas is enabled (-DENABLE_ACCELERATED_2D_CANVAS=ON) due to a redefinition error during the Webkit build: ... /usr/include/GLES2/gl2.h:503:82: error: 'void epoxy_glAttachShader(GLuint, GLuint)' redeclared as different kind of symbol GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader); ... Related to https://bugs.webkit.org/show_bug.cgi?id=172104 1414882 1 338031 psaavedra 2018-04-16 13:28:11 -0700 Created attachment 338031 Patch 1414884 2 338032 psaavedra 2018-04-16 13:35:29 -0700 Created attachment 338032 patch 1415046 3 338032 commit-queue 2018-04-16 23:54:32 -0700 Comment on attachment 338032 patch Clearing flags on attachment: 338032 Committed r230702: <https://trac.webkit.org/changeset/230702> 1415047 4 commit-queue 2018-04-16 23:54:33 -0700 All reviewed patches have been landed. Closing bug. 1415048 5 webkit-bug-importer 2018-04-16 23:55:16 -0700 <rdar://problem/39482971> 338031 2018-04-16 13:28:11 -0700 2018-04-16 13:35:24 -0700 Patch bug-184661-20180416222810.patch text/plain 2542 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRlNjQ3MjIxNzdhNmE2 ODQ1ZmIwMjg0OGM2ZjVlYTI3MDU3ZDgxNS4uMjY4OGI2YWZlMTUxYjRhMGFhZWQzNjY5MDIyOWZi YTY4YmE4OTNlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA0LTE2ICBUaGli YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTZXQgVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lciBtZXRhZGF0YSBpbmZvcm1hdGlvbiBldmVu IGlmIG5vIGNsaWVudCBpcyBhdmFsYWlibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NDY1MQorCisgICAgICAgIFJldmlld2VkIGJ5IFBoaWxpcHBl IE5vcm1hbmQuCisKKyAgICAgICAgV2UgY2FuJ3Qgbm90aWZ5IHRoZSBjbGllbnQgaWYgbm9uZSBp cyBjb25uZWN0ZWQsIGJ1dCBzdGlsbCB3ZSBuZWVkIHRvIGZpbGwgb3VyIG1ldGFkYXRhcyBmcm9t CisgICAgICAgIHRoZSBwcm92aWRlZCBHc3RUYWdMaXN0LCBlc3BlY2lhbGx5IGluIHRoZSBjYXNl IG9mIHBsYXliaW4zIHdoZXJlIHRoZSBjbGllbnQgaXMgbm90IHNldCB5ZXQKKyAgICAgICAgYXQg Y29uc3RydWN0IHRpbWUgYnV0IHRoZSBtZXRhZGF0YSBtaWdodCBhbHJlYWR5IGJlIHByZXNldCAo YW5kIHdvbid0IGJlIHVwZGF0ZWQgbGF0ZXIgb24pLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBh cmUgYWRkZWQgYXMgd2UgYWxyZWFkeSBoYXZlIGEgZmV3IG9uZXMgdGhhdCBhcmUgY3VycmVudGx5 IGRpc2FibGVkIGluCisgICAgICAgIHRoZSBtZWRpYXN0cmVhbSB0ZXN0c3VpdGUuIFRoaXMgcGF0 Y2ggaXMgcGFydCBvZiB0aGUgd29yayB0byBlbmFibGUgdGhlbS4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9UcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlRyYWNrUHJpdmF0ZUJhc2VHU3RyZWFtZXI6Om5vdGlmeVRyYWNrT2ZU YWdzQ2hhbmdlZCk6CisKIDIwMTgtMDQtMTYgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxl LmNvbT4KIAogICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIEVuc3VyZSB3ZSBuZXZlciByZXR1cm4g LTAgdGhyb3VnaCB0aGUgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVHJhY2tQcml2YXRlQmFzZUdTdHJl YW1lci5jcHAKaW5kZXggMjU0ZGE3OGRhMGM4YzIwMGRjMjhhNDBlNzIwZmY1OTJjM2M2YzBhOS4u MDViYTFlNWIxMjM4M2QxMjdlYzBkNjU1Mzc3YmZhYWY2ZGZkOTc1OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RyYWNrUHJpdmF0ZUJhc2VH U3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9UcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyLmNwcApAQCAtMTcyLDE4ICsxNzIsMTcgQEAg Ym9vbCBUcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyOjpnZXRUYWcoR3N0VGFnTGlzdCogdGFncywg Y29uc3QgZ2NoYXIqIHRhZ05hbWUsIFMKIHZvaWQgVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6 bm90aWZ5VHJhY2tPZlRhZ3NDaGFuZ2VkKCkKIHsKICAgICBUcmFja1ByaXZhdGVCYXNlQ2xpZW50 KiBjbGllbnQgPSBtX293bmVyLT5jbGllbnQoKTsKLSAgICBpZiAoIWNsaWVudCkKLSAgICAgICAg cmV0dXJuOwogCiAgICAgR1JlZlB0cjxHc3RUYWdMaXN0PiB0YWdzOwogICAgIHsKICAgICAgICAg TG9ja0hvbGRlciBsb2NrKG1fdGFnTXV0ZXgpOwogICAgICAgICB0YWdzLnN3YXAobV90YWdzKTsK ICAgICB9CisKICAgICBpZiAoIXRhZ3MpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChnZXRU YWcodGFncy5nZXQoKSwgR1NUX1RBR19USVRMRSwgbV9sYWJlbCkpCisgICAgaWYgKGdldFRhZyh0 YWdzLmdldCgpLCBHU1RfVEFHX1RJVExFLCBtX2xhYmVsKSAmJiBjbGllbnQpCiAgICAgICAgIGNs aWVudC0+bGFiZWxDaGFuZ2VkKG1fbGFiZWwpOwogCiAgICAgQXRvbWljU3RyaW5nIGxhbmd1YWdl OwpAQCAtMTk0LDcgKzE5Myw4IEBAIHZvaWQgVHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lcjo6bm90 aWZ5VHJhY2tPZlRhZ3NDaGFuZ2VkKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9sYW5ndWFn ZSA9IGxhbmd1YWdlOwotICAgIGNsaWVudC0+bGFuZ3VhZ2VDaGFuZ2VkKG1fbGFuZ3VhZ2UpOwor ICAgIGlmIChjbGllbnQpCisgICAgICAgIGNsaWVudC0+bGFuZ3VhZ2VDaGFuZ2VkKG1fbGFuZ3Vh Z2UpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 338032 2018-04-16 13:35:29 -0700 2018-04-16 23:54:32 -0700 patch bug-184661-20180416223527.patch text/plain 1990 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY4OGI2YWZlMTUxYjRh MGFhZWQzNjY5MDIyOWZiYTY4YmE4OTNlZS4uYzhiMGI0YTI3M2NjZTJhMDIzMTk3ZGEyZDc4YjA2 NGVmYzY3Njc2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTA0LTE2ICBQYWJs byBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgorCisgICAgICAgIEluY29uc2lzdGVu dCBFR0wgZGVmaW5lcyBpbiBJbWFnZUJ1ZmZlckNhaXJvCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ2NjEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbiByZXZpc2lvbiByMjE5MzkxIGxpYmVwb3h5IGlz IGFkZGVkLiBUaGUgaGVhZGVycyBpbgorICAgICAgICBJbWFnZUJ1ZmZlckNhaXJvLmNwcCBiZWNv bWUgaW5jb25zaXN0ZW50IHdoZW4gMkQgY2FudmFzIGlzIGVuYWJsZWQKKyAgICAgICAgKC1ERU5B QkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUz1PTikgZHVlIHRvIGEgcmVkZWZpbml0aW9uIGVycm9y IGR1cmluZworICAgICAgICB0aGUgV2Via2l0IGJ1aWxkOgorCisgICAgICAgICAgICAuLi4KKyAg ICAgICAgICAgIC91c3IvaW5jbHVkZS9HTEVTMi9nbDIuaDo1MDM6ODI6IGVycm9yOiAndm9pCisg ICAgICAgICAgICBlcG94eV9nbEF0dGFjaFNoYWRlcihHTHVpbnQsIEdMdWludCknIHJlZGVjbGFy ZWQgYXMgZGlmZmVyZW50IGtpbmQKKyAgICAgICAgICAgIG9mIHN5bWJvbAorICAgICAgICAgICAg R0xfQVBJQ0FMTCB2b2lkICAgICAgICAgR0xfQVBJRU5UUlkgZ2xBdHRhY2hTaGFkZXIgKEdMdWlu dAorICAgICAgICAgICAgcHJvZ3JhbSwgR0x1aW50IHNoYWRlcik7CisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJD YWlyby5jcHA6CisKIDIwMTgtMDQtMTYgIFRoaWJhdWx0IFNhdW5pZXIgIDx0c2F1bmllckBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIFNldCBUcmFja1ByaXZhdGVCYXNlR1N0cmVh bWVyIG1ldGFkYXRhIGluZm9ybWF0aW9uIGV2ZW4gaWYgbm8gY2xpZW50IGlzIGF2YWxhaWJsZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VC dWZmZXJDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9J bWFnZUJ1ZmZlckNhaXJvLmNwcAppbmRleCBmNTBiNGJlZjFhMjVmM2NiZDAyMmYyZjIzMzBlMWVl MWQwZWE5YzYwLi5kMzVlYWRjMjdjODI1ZDNjNWQyNjY1MjU0YjJlYmVjYjJmZmRhYTM1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZl ckNhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9J bWFnZUJ1ZmZlckNhaXJvLmNwcApAQCAtNTIsMTIgKzUyLDE4IEBACiAjaW5jbHVkZSAiR0xDb250 ZXh0LmgiCiAjaW5jbHVkZSAiVGV4dHVyZU1hcHBlckdMLmgiCiAKLSNpZiBVU0UoRUdMKSAmJiBV U0UoTElCRVBPWFkpCisjaWYgVVNFKEVHTCkKKyNpZiBVU0UoTElCRVBPWFkpCiAjaW5jbHVkZSAi RXBveHlFR0wuaCIKKyNlbHNlCisjaW5jbHVkZSA8RUdML2VnbC5oPgorI2VuZGlmCiAjZW5kaWYK ICNpbmNsdWRlIDxjYWlyby1nbC5oPgogCi0jaWYgVVNFKE9QRU5HTF9FUykKKyNpZiBVU0UoTElC RVBPWFkpCisjaW5jbHVkZSA8ZXBveHkvZ2wuaD4KKyNlbGlmIFVTRShPUEVOR0xfRVMpCiAjaW5j bHVkZSA8R0xFUzIvZ2wyLmg+CiAjZWxzZQogI2luY2x1ZGUgIk9wZW5HTFNoaW1zLmgiCg==