Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849

* changes:
  Merge WebKit at r65072 : Update WebKit revision number.
  Merge WebKit at r65072 : Update test_expectations.
  Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
  Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
  Merge WebKit at r65072: JSC build fix in InspectorController.h
  Merge WebKit at r65072: Fix V8 code generator.
  Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
  Merge WebKit at r65072: String class has moved to the WTF namespace.
  Merge Webkit at r65072 : Fix conflicts.
  Merge Webkit at r65072 : Fix Makefiles.
  Merge WebKit at r65072 : Initial merge by git.

1 files changed, 12 insertions, 10 deletions

diff --git a/WebKitTools/QtTestBrowser/main.cpp b/WebKitTools/QtTestBrowser/main.cpp
index 33a6416..842290b 100644
--- a/WebKitTools/QtTestBrowser/main.cpp
+++ b/WebKitTools/QtTestBrowser/main.cpp
@@ -33,6 +33,8 @@
 #include "launcherwindow.h"
 #include "urlloader.h"
 
+WindowOptions windowOptions;
+
 int launcherMain(const QApplication& app)
 {
 #ifndef NDEBUG
@@ -89,7 +91,7 @@ LauncherApplication::LauncherApplication(int& argc, char** argv)
 
 static void requiresGraphicsView(const QString& option)
 {
-    if (LauncherWindow::gUseGraphicsView)
+    if (windowOptions.useGraphicsView)
         return;
     appQuit(1, QString("%1 only works in combination with the -graphicsbased option").arg(option));
 }
@@ -121,31 +123,31 @@ void LauncherApplication::handleUserOptions()
     }
 
     if (args.contains("-graphicsbased"))
-        LauncherWindow::gUseGraphicsView = true;
+        windowOptions.useGraphicsView = true;
 
     if (args.contains("-no-compositing")) {
         requiresGraphicsView("-no-compositing");
-        LauncherWindow::gUseCompositing = false;
+        windowOptions.useCompositing = false;
     }
 
     if (args.contains("-show-fps")) {
         requiresGraphicsView("-show-fps");
-        LauncherWindow::gShowFrameRate = true;
+        windowOptions.showFrameRate = true;
     }
 
     if (args.contains("-cache-webview")) {
         requiresGraphicsView("-cache-webview");
-        LauncherWindow::gCacheWebView = true;
+        windowOptions.cacheWebView = true;
     }
 
     if (args.contains("-tiled-backing-store")) {
         requiresGraphicsView("-tiled-backing-store");
-        LauncherWindow::gUseTiledBackingStore = true;
+        windowOptions.useTiledBackingStore = true;
     }
 
     if (args.contains("-resizes-to-contents")) {
         requiresGraphicsView("-resizes-to-contents");
-        LauncherWindow::gResizesToContents = true;
+        windowOptions.resizesToContents = true;
     }
 
     QString arg1("-viewport-update-mode");
@@ -160,13 +162,13 @@ void LauncherApplication::handleUserOptions()
         if (idx == -1)
             appQuit(1, QString("%1 value has to be one of [%2]").arg(arg1).arg(formatKeys(updateModes)));
 
-        LauncherWindow::gViewportUpdateMode = static_cast<QGraphicsView::ViewportUpdateMode>(idx);
+        windowOptions.viewportUpdateMode = static_cast<QGraphicsView::ViewportUpdateMode>(idx);
     }
 
     QString inspectorUrlArg("-inspector-url");
     int inspectorUrlIndex = args.indexOf(inspectorUrlArg);
     if (inspectorUrlIndex != -1)
-       LauncherWindow::gInspectorUrl = takeOptionValue(&args, inspectorUrlIndex);
+       windowOptions.inspectorUrl = takeOptionValue(&args, inspectorUrlIndex);
 
     int robotIndex = args.indexOf("-r");
     if (robotIndex != -1) {
@@ -213,7 +215,7 @@ int main(int argc, char **argv)
     foreach (QString url, urls) {
         LauncherWindow* newWindow;
         if (!window)
-            newWindow = window = new LauncherWindow();
+            newWindow = window = new LauncherWindow(&windowOptions);
         else
             newWindow = window->newWindow();