Changeset 86268 in webkit

Timestamp:

May 11, 2011 2:14:17 PM (13 years ago)

Author:

noam.rosenthal@nokia.com

Message:

2011-05-11 Noam Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
​https://bugs.webkit.org/show_bug.cgi?id=60439

Patch 4/12: Update the settings to enable accelerated compositing for all the relevant settings
attributes.

• Api/qwebsettings.cpp: (qt_networkAccessAllowed): (QWebSettingsPrivate::apply):

2011-05-11 Noam Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
​https://bugs.webkit.org/show_bug.cgi?id=60439

Patch 4/12: Update the build script to enable 3D rendering by default for Qt.

• Scripts/build-webkit:

Location:

trunk

Files:

• Source/WebKit/qt/Api/qwebsettings.cpp (modified) (3 diffs)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-webkit (modified) (1 diff)

trunk/Source/WebKit/qt/Api/qwebsettings.cpp

@@ -58 +58 @@
 void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed)
 {
-#if USE(QT_BEARER)
+#if ENABLE(QT_BEARER)
     WebCore::networkStateNotifier().setNetworkAccessAllowed(isAllowed);
 #endif
@@ -173 +173 @@
                                       global->attributes.value(QWebSettings::AcceleratedCompositingEnabled));
 
-        settings->setAcceleratedCompositingEnabled(value);
+        settings->setAcceleratedCompositingFor3DTransformsEnabled(value);
+        settings->setAcceleratedCompositingForAnimationEnabled(value);
+        settings->setAcceleratedCompositingForVideoEnabled(value);
 #endif
 #if ENABLE(WEBGL)
@@ -180 +182 @@
 
         settings->setWebGLEnabled(value);
+#if USE(ACCELERATED_COMPOSITING)
+        settings->setAcceleratedCompositingForCanvasEnabled(value);
+#endif
 #endif
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-11  Noam Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
+        https://bugs.webkit.org/show_bug.cgi?id=60439
+
+        Patch 4/12: Update the settings to enable accelerated compositing for all the relevant settings
+        attributes.
+
+        * Api/qwebsettings.cpp:
+        (qt_networkAccessAllowed):
+        (QWebSettingsPrivate::apply):
+
 2011-05-11  Sam Weinig  <sam@webkit.org>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-11  Noam Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
+        https://bugs.webkit.org/show_bug.cgi?id=60439
+
+        Patch 4/12: Update the build script to enable 3D rendering by default for Qt.
+
+        * Scripts/build-webkit:
+
 2011-05-11  Brian Weinstein  <bweinstein@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -132 +132 @@
 
     { option => "3d-rendering", desc => "Toggle 3D rendering support",
-      define => "ENABLE_3D_RENDERING", default => isAppleMacWebKit(), value => \$threeDRenderingSupport },
+      define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() || isQt()), value => \$threeDRenderingSupport },
 
     { option => "accelerated-2d-canvas", desc => "Toggle accelerated 2D canvas support",