Changeset 56146 in webkit

Timestamp:

Mar 17, 2010 8:41:38 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-17 Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Accelerated Compositing is now default on QtWebKit so the option
in QtLauncher must be true as default.

[Qt] QtLauncher's Accelerated Compositing option must be true as default
​https://bugs.webkit.org/show_bug.cgi?id=36234

• QtLauncher/main.cpp: (LauncherWindow::applyPrefs): (LauncherWindow::toggleAcceleratedCompositing): (LauncherApplication::handleUserOptions):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (5 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-17  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Accelerated Compositing is now default on QtWebKit so the option
+        in QtLauncher must be true as default.
+
+        [Qt] QtLauncher's Accelerated Compositing option must be true as default
+        https://bugs.webkit.org/show_bug.cgi?id=36234
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::applyPrefs):
+        (LauncherWindow::toggleAcceleratedCompositing):
+        (LauncherApplication::handleUserOptions):
+
 2010-03-17  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -73 +73 @@
 static const int gExitClickArea = 80;
 static bool gUseGraphicsView = false;
-static bool gUseCompositing = false;
+static bool gUseCompositing = true;
 static bool gCacheWebView = false;
 static bool gShowFrameRate = false;
@@ -242 +242 @@
 
     applySetting(QWebSettings::AcceleratedCompositingEnabled, settings, other, gUseCompositing);
-    applySetting(QWebSettings::TiledBackingStoreEnabled, settings, other, gUseTiledBackingStore);;
+    applySetting(QWebSettings::TiledBackingStoreEnabled, settings, other, gUseTiledBackingStore);
     applySetting(QWebSettings::WebGLEnabled, settings, other, false);
 
@@ -531 +531 @@
 void LauncherWindow::toggleAcceleratedCompositing(bool toggle)
 {
+    gUseCompositing = toggle;
     page()->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, toggle);
 }
@@ -918 +919 @@
         qDebug() << "Usage:" << programName.toLatin1().data()
              << "[-graphicsbased]"
-             << "[-compositing]"
+             << "[-no-compositing]"
              << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
              << "[-cache-webview]"
@@ -933 +934 @@
         gUseGraphicsView = true;
 
-    if (args.contains("-compositing")) {
-        requiresGraphicsView("-compositing");
-        gUseCompositing = true;
+    if (args.contains("-no-compositing")) {
+        requiresGraphicsView("-no-compositing");
+        gUseCompositing = false;
     }