118536 2013-07-10 12:12:23 -0700 Non-Cairo platforms should be able to use EGL 2013-07-18 15:11:01 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P4 Trivial --- 0 achristensen webkit-unassigned commit-queue oldest_to_newest 907429 0 achristensen 2013-07-10 12:12:23 -0700 GLContextEGL.cpp does not compile successfully on non-Cairo platforms (such as the Apple Win port) because it includes cairo.h and has one call to a cairo function. These should be put inside of USE(CAIRO) macros. 907430 1 206405 achristensen 2013-07-10 12:14:27 -0700 Created attachment 206405 patch 909858 2 207019 achristensen 2013-07-18 13:53:20 -0700 Created attachment 207019 Patch 909859 3 207019 bfulgham 2013-07-18 13:57:06 -0700 Comment on attachment 207019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207019&action=review r=me > Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:28 > +#include <cairo.h> I guess the 2D drawing stuff is not brought in with the 3D graphics context. We may end up with a big ifdef block here. > Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:229 > +#endif Ditto -- other platforms will probably have similar cleanup requirements. 909886 4 207019 commit-queue 2013-07-18 15:10:59 -0700 Comment on attachment 207019 Patch Clearing flags on attachment: 207019 Committed r152869: <http://trac.webkit.org/changeset/152869> 909887 5 commit-queue 2013-07-18 15:11:01 -0700 All reviewed patches have been landed. Closing bug. 206405 2013-07-10 12:14:27 -0700 2013-07-18 13:53:18 -0700 patch cairo.diff text/plain 1505 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjUzOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA3LTEwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KKworICAgICAgICBGaXhlZCBjb21w aWxlIGVycm9ycyBmb3Igbm9uLUNhaXJvIHBsYXRmb3JtcyB1c2luZyBFR0wuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg1MzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2VnbC9HTENvbnRleHRFR0wuY3BwOiBBZGRlZCAjaWYgVVNFKENBSVJPKSBhcm91bmQgY2Fpcm8u aC4KKyAgICAgICAgKFdlYkNvcmU6OkdMQ29udGV4dEVHTDo6fkdMQ29udGV4dEVHTCk6IEFkZGVk ICNpZiBVU0UoQ0FJUk8pIGFyb3VuZCBjYWlyb19kZXZpY2VfZGVzdHJveSBjYWxsLiAKKwogMjAx My0wNy0xMCAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvLnByYWRhQHNhbXN1bmcuY29tPgog CiAgICAgICAgIEFYOiBBbGxvdyByZXF1ZXN0aW5nIHRoZSBmdWxsIHBsYWluIHRleHQgZm9yIGFu IG9iamVjdCB3aXRoIHRleHRVbmRlckVsZW1lbnQoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5jcHAJKHJldmlzaW9u IDE1MjQ5OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VnbC9HTENvbnRl eHRFR0wuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw5ICsyMiwxMiBAQAogI2lmIFVTRShFR0wp CiAKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQzRC5oIgotI2luY2x1ZGUgPGNhaXJvLmg+CiAj aW5jbHVkZSA8d3RmL093blB0ci5oPgogCisjaWYgVVNFKENBSVJPKQorI2luY2x1ZGUgPGNhaXJv Lmg+CisjZW5kaWYKKwogI2lmIFVTRShPUEVOR0xfRVNfMikKICNpbmNsdWRlIDxHTEVTMi9nbDIu aD4KICNpbmNsdWRlIDxHTEVTMi9nbDJleHQuaD4KQEAgLTIyMCw4ICsyMjMsMTAgQEAKIAogR0xD b250ZXh0RUdMOjp+R0xDb250ZXh0RUdMKCkKIHsKKyNpZiBVU0UoQ0FJUk8pCiAgICAgaWYgKG1f Y2Fpcm9EZXZpY2UpCiAgICAgICAgIGNhaXJvX2RldmljZV9kZXN0cm95KG1fY2Fpcm9EZXZpY2Up OworI2VuZGlmCiAKICAgICBFR0xEaXNwbGF5IGRpc3BsYXkgPSBzaGFyZWRFR0xEaXNwbGF5KCk7 CiAgICAgaWYgKG1fY29udGV4dCkgewo= 207019 2013-07-18 13:53:20 -0700 2013-07-18 15:10:59 -0700 Patch bug-118536-20130718135320.patch text/plain 1495 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1Mjg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA3LTE3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KKworICAgICAgICBGaXhlZCBjb21w aWxlIGVycm9ycyBmb3Igbm9uLUNhaXJvIHBsYXRmb3JtcyB1c2luZyBFR0wuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg1MzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2VnbC9HTENvbnRleHRFR0wuY3BwOiBBZGRlZCAjaWYgVVNFKENBSVJPKSBhcm91bmQgY2Fpcm8u aC4KKyAgICAgICAgKFdlYkNvcmU6OkdMQ29udGV4dEVHTDo6fkdMQ29udGV4dEVHTCk6IEFkZGVk ICNpZiBVU0UoQ0FJUk8pIGFyb3VuZCBjYWlyb19kZXZpY2VfZGVzdHJveSBjYWxsLiAKKwogMjAx My0wNy0xNyAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBb V2luZG93c10gU3VwcG9ydCBpbi1iYW5kIHRleHQgdHJhY2tzLgpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5jcHAJKHJl dmlzaW9uIDE1Mjg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VnbC9H TENvbnRleHRFR0wuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw5ICsyMiwxMiBAQAogI2lmIFVT RShFR0wpCiAKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQzRC5oIgotI2luY2x1ZGUgPGNhaXJv Lmg+CiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgogCisjaWYgVVNFKENBSVJPKQorI2luY2x1ZGUg PGNhaXJvLmg+CisjZW5kaWYKKwogI2lmIFVTRShPUEVOR0xfRVNfMikKICNpbmNsdWRlIDxHTEVT Mi9nbDIuaD4KICNpbmNsdWRlIDxHTEVTMi9nbDJleHQuaD4KQEAgLTIyMCw4ICsyMjMsMTAgQEAg R0xDb250ZXh0RUdMOjpHTENvbnRleHRFR0woRUdMQ29udGV4dCBjbwogCiBHTENvbnRleHRFR0w6 On5HTENvbnRleHRFR0woKQogeworI2lmIFVTRShDQUlSTykKICAgICBpZiAobV9jYWlyb0Rldmlj ZSkKICAgICAgICAgY2Fpcm9fZGV2aWNlX2Rlc3Ryb3kobV9jYWlyb0RldmljZSk7CisjZW5kaWYK IAogICAgIEVHTERpc3BsYXkgZGlzcGxheSA9IHNoYXJlZEVHTERpc3BsYXkoKTsKICAgICBpZiAo bV9jb250ZXh0KSB7Cg==