135687 2014-08-06 20:43:06 -0700 [Win] Correct build errors when WebGL Disabled 2014-08-07 09:25:37 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue dino kondapallykalyan noam roger_fong webkit-bug-importer oldest_to_newest 1027408 0 bfulgham 2014-08-06 20:43:06 -0700 Attempting to build with the WebGL feature disabled revealed a few problems: 1. The 'DebugSuffix' target was attempting to build Cairo graphics files in addition to the CG files needed for this target. 2. Several files were including headers that themselves included ANGLE and other WebGL-specific files. (a) platform/graphics/GLContext.cpp (b) platform/graphics/GraphicsContext3DPrivate.cpp (c) platform/graphics/opengl/GLPlatformContext.cpp (d) platform/graphics/opengl/GLPlatformSurface.cpp Although these files are configured to compile during non-WebGL builds, they are supposed to have appropriate compile guards so that no code is generated when the features are turned off. Consequently, these files needed the "#if ENABLE(3D_GRAPHICS)" macro to be moved higher in the file (or added, in the case of the GLPlatformContext.cpp and GLPlatformSurface.cpp). 1027410 1 236171 bfulgham 2014-08-06 20:45:03 -0700 Created attachment 236171 Patch 1027411 2 webkit-bug-importer 2014-08-06 20:45:50 -0700 <rdar://problem/17941465> 1027418 3 bfulgham 2014-08-06 22:13:05 -0700 Committed in r172202. <http://trac.webkit.org/changeset/172202> 236171 2014-08-06 20:45:03 -0700 2014-08-07 09:25:37 -0700 Patch bug-135687-20140806204535.patch text/plain 4157 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjIwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA4LTA2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIENvcnJlY3QgYnVp bGQgZXJyb3JzIHdoZW4gV2ViR0wgRGlzYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTY4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvajog RG9uJ3QgYnVpbGQgQ2Fpcm8gZmlsZXMKKyAgICAgICAgd2hlbiBidWlsZGluZyBDRy4KKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuY3BwOiBDb3JyZWN0IHVzZSBvZiAzRF9H UkFQSElDUyBtYWNyby4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQzRFByaXZhdGUuY3BwOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvR0xQbGF0Zm9ybUNvbnRleHQuY3BwOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9vcGVuZ2wvR0xQbGF0Zm9ybVN1cmZhY2UuY3BwOiBEaXR0by4KKwogMjAxNC0wOC0wNiAg TXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1Nd IE1ha2UgZG9jdW1lbnQgbWFya2VyIGFzc2V0cyBub3Qgc3BlY2lmaWMgdG8gcGFydGljdWxhciBz Y2FsZSBmYWN0b3JzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29y ZS52Y3hwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9X ZWJDb3JlLnZjeHByb2oJKHJldmlzaW9uIDE3MjE2NCkKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNv cmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTczOTUsNiArNzM5 NSw4IEBACiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0 aW9uKXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1 aWxkPgogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlv bil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXxXaW4zMiciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxk PgogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8 JChQbGF0Zm9ybSknPT0nUmVsZWFzZXx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KKyAg ICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxh dGZvcm0pJz09J0RlYnVnU3VmZml4fHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgorICAg ICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0 Zm9ybSknPT0nRGVidWdTdWZmaXh8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KICAg ICA8L0NsQ29tcGlsZT4KICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXHBsYXRmb3JtXGdyYXBo aWNzXEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5jcHAiIC8+CiAgICAgPENsQ29tcGlsZSBJbmNs dWRlPSIuLlxwbGF0Zm9ybVxncmFwaGljc1xjYVx3aW5cUGxhdGZvcm1DQUZpbHRlcnNXaW4uY3Bw Ij4KQEAgLTIxMzU2LDQgKzIxMzU4LDQgQEAKICAgPEltcG9ydEdyb3VwIExhYmVsPSJFeHRlbnNp b25UYXJnZXRzIj4KICAgICA8SW1wb3J0IFByb2plY3Q9IiQoVkNUYXJnZXRzUGF0aClcQnVpbGRD dXN0b21pemF0aW9uc1xtYXNtLnRhcmdldHMiIC8+CiAgIDwvSW1wb3J0R3JvdXA+Ci08L1Byb2pl Y3Q+Cis8L1Byb2plY3Q+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuY3BwCShyZXZpc2lvbiAx NzIxNjQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xNyw5ICsxNyw5IEBACiAgKi8KIAogI2luY2x1ZGUgImNvbmZp Zy5oIgotI2luY2x1ZGUgIkdMQ29udGV4dC5oIgogCiAjaWYgVVNFKE9QRU5HTCkKKyNpbmNsdWRl ICJHTENvbnRleHQuaCIKIAogI2lmIFVTRShFR0wpCiAjaW5jbHVkZSAiR0xDb250ZXh0RUdMLmgi CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQz RFByaXZhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5jcHAJKHJldmlzaW9uIDE3MjE2NCkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE4LDkgKzE4LDkgQEAKICAqLwogCiAjaW5jbHVkZSAiY29u ZmlnLmgiCi0jaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmgiCiAKICNpZiBVU0Uo M0RfR1JBUEhJQ1MpCisjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmgiCiAKICNp bmNsdWRlICJIb3N0V2luZG93LmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HTFBsYXRmb3JtQ29udGV4 dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3Bl bmdsL0dMUGxhdGZvcm1Db250ZXh0LmNwcAkocmV2aXNpb24gMTcyMTY0KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1Db250ZXh0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjQsNiArMjQsOCBAQAogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIK KworI2lmIFVTRSgzRF9HUkFQSElDUykKICNpbmNsdWRlICJHTFBsYXRmb3JtQ29udGV4dC5oIgog CiAjaWYgVVNFKEdMWCkKQEAgLTI3OCw0ICsyODAsNiBAQCB2b2lkIEdMUGxhdGZvcm1Db250ZXh0 OjpkZXN0cm95KCkKICAgICBtX3Jlc2V0TG9zdENvbnRleHQgPSBmYWxzZTsKIH0KIAorI2VuZGlm CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9HTFBsYXRmb3JtU3VyZmFjZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNw cAkocmV2aXNpb24gMTcyMTY0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQsNiArMjQs OCBAQAogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKKworI2lmIFVTRSgzRF9HUkFQSElDUykK ICNpbmNsdWRlICJHTFBsYXRmb3JtU3VyZmFjZS5oIgogCiAjaWYgVVNFKEdMWCkKQEAgLTEzMCw0 ICsxMzIsNiBAQCBHTFBsYXRmb3JtU3VyZmFjZTo6U3VyZmFjZUF0dHJpYnV0ZXMgR0xQCiAgICAg cmV0dXJuIEdMUGxhdGZvcm1TdXJmYWNlOjpEZWZhdWx0OwogfQogCisjZW5kaWYKKwogfQo=