Title: [122334] trunk/Source/WebCore
Revision
122334
Author
[email protected]
Date
2012-07-11 08:08:09 -0700 (Wed, 11 Jul 2012)

Log Message

[Qt] REGRESSION(r122250): It broke USE(3D_GRAPHICS)=1 and ENABLE(WEBGL)=0 builds
https://bugs.webkit.org/show_bug.cgi?id=90943

Patch by Joshua Netterfield <[email protected]> on 2012-07-11
Reviewed by Csaba Osztrogonác.

Uses proper guarding in Extensions3DOpenGLCommon and Extensions3DOpenGLES as per https://bugs.webkit.org/show_bug.cgi?id=90506.

No new tests, becasue there is no new functionality.

* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: Use proper guarding.
* platform/graphics/opengl/Extensions3DOpenGLES.cpp: Use proper guarding.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (122333 => 122334)


--- trunk/Source/WebCore/ChangeLog	2012-07-11 15:05:23 UTC (rev 122333)
+++ trunk/Source/WebCore/ChangeLog	2012-07-11 15:08:09 UTC (rev 122334)
@@ -1,3 +1,17 @@
+2012-07-11  Joshua Netterfield  <[email protected]>
+
+        [Qt] REGRESSION(r122250): It broke USE(3D_GRAPHICS)=1 and ENABLE(WEBGL)=0 builds
+        https://bugs.webkit.org/show_bug.cgi?id=90943
+
+        Reviewed by Csaba Osztrogonác.
+
+        Uses proper guarding in Extensions3DOpenGLCommon and Extensions3DOpenGLES as per https://bugs.webkit.org/show_bug.cgi?id=90506.
+
+        No new tests, becasue there is no new functionality.
+
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: Use proper guarding.
+        * platform/graphics/opengl/Extensions3DOpenGLES.cpp: Use proper guarding.
+
 2012-07-10  Pavel Feldman  <[email protected]>
 
         Web Inspector: migrate from background images to CSS for statusbar rendering.

Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (122333 => 122334)


--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2012-07-11 15:05:23 UTC (rev 122333)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2012-07-11 15:08:09 UTC (rev 122334)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#if ENABLE(WEBGL)
+#if USE(3D_GRAPHICS)
 #include "Extensions3DOpenGLCommon.h"
 
 #include "ANGLEWebKitBridge.h"
@@ -145,4 +145,4 @@
 
 } // namespace WebCore
 
-#endif // ENABLE(WEBGL)
+#endif // USE(3D_GRAPHICS)

Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp (122333 => 122334)


--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp	2012-07-11 15:05:23 UTC (rev 122333)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp	2012-07-11 15:08:09 UTC (rev 122334)
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#if ENABLE(WEBGL)
+#if USE(3D_GRAPHICS)
 #include "Extensions3DOpenGLES.h"
 
 #include "GraphicsContext3D.h"
@@ -146,4 +146,4 @@
 
 } // namespace WebCore
 
-#endif // ENABLE(WEBGL)
+#endif // USE(3D_GRAPHICS)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to