Title: [92805] trunk/Source/WebCore
Revision
92805
Author
[email protected]
Date
2011-08-10 17:27:47 -0700 (Wed, 10 Aug 2011)

Log Message

[Qt] Enable WebGL by default for QtWebKit
https://bugs.webkit.org/show_bug.cgi?id=65998

Reviewed by Benjamin Poulain.

Make ENABLE_WEBGL true by default when Qt is configured with OpenGL.

No new tests. Build change only.

* features.pri:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (92804 => 92805)


--- trunk/Source/WebCore/ChangeLog	2011-08-11 00:17:05 UTC (rev 92804)
+++ trunk/Source/WebCore/ChangeLog	2011-08-11 00:27:47 UTC (rev 92805)
@@ -1,3 +1,16 @@
+2011-08-10  No'am Rosenthal  <[email protected]>
+
+        [Qt] Enable WebGL by default for QtWebKit
+        https://bugs.webkit.org/show_bug.cgi?id=65998
+
+        Reviewed by Benjamin Poulain.
+
+        Make ENABLE_WEBGL true by default when Qt is configured with OpenGL.
+
+        No new tests. Build change only.
+
+        * features.pri:
+
 2011-08-10  Abhishek Arya  <[email protected]>
 
         Check that we do not need layout before trying to dirty

Modified: trunk/Source/WebCore/features.pri (92804 => 92805)


--- trunk/Source/WebCore/features.pri	2011-08-11 00:17:05 UTC (rev 92804)
+++ trunk/Source/WebCore/features.pri	2011-08-11 00:27:47 UTC (rev 92805)
@@ -88,7 +88,6 @@
 !contains(DEFINES, ENABLE_INSPECTOR=.): DEFINES += ENABLE_INSPECTOR=1
 !contains(DEFINES, ENABLE_3D_RENDERING=.): DEFINES += ENABLE_3D_RENDERING=1
 !contains(DEFINES, ENABLE_WEB_AUDIO=.): DEFINES += ENABLE_WEB_AUDIO=0
-!contains(DEFINES, ENABLE_WEBGL=.): DEFINES += ENABLE_WEBGL=0
 !contains(DEFINES, ENABLE_MEDIA_STATISTICS=.): DEFINES += ENABLE_MEDIA_STATISTICS=0
 !contains(DEFINES, ENABLE_MEDIA_STREAM=.): DEFINES += ENABLE_MEDIA_STREAM=0
 !contains(DEFINES, ENABLE_VIDEO_TRACK=.): DEFINES += ENABLE_VIDEO_TRACK=0
@@ -122,6 +121,13 @@
     }
 }
 
+# WebGL support
+contains(QT_CONFIG, opengl) {
+    !contains(DEFINES, ENABLE_WEBGL=.): DEFINES += ENABLE_WEBGL=1
+} else {
+    DEFINES += ENABLE_WEBGL=0
+}
+
 # Web Socket support.
 !contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to