[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ac4afb9d812bd4e717897985d749a8c78425063e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 24 16:59:09 2010 +0000

    2010-10-24  Yi Shen  <yi.4.shen at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt][QtTestBrowser] Toggle use of QGraphicsView messes up the menu
            https://bugs.webkit.org/show_bug.cgi?id=48141
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::init):
            (LauncherWindow::initializeView):
            (LauncherWindow::toggleWebView):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70417 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8229503..f33eb54 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-24  Yi Shen  <yi.4.shen at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][QtTestBrowser] Toggle use of QGraphicsView messes up the menu
+        https://bugs.webkit.org/show_bug.cgi?id=48141
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::init):
+        (LauncherWindow::initializeView):
+        (LauncherWindow::toggleWebView):
+
 2010-10-24  Daniel Bates  <dbates at rim.com>
 
         Reviewed by David Kilzer.
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index df29f11..a05f942 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -70,28 +70,14 @@ void LauncherWindow::init()
     resize(800, 600);
 #endif
 
-    initializeView();
-
-    connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStarted()));
-    connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
-    connect(page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
-            this, SLOT(showLinkHover(const QString&, const QString&)));
-    connect(this, SIGNAL(enteredFullScreenMode(bool)), this, SLOT(toggleFullScreenMode(bool)));
-
-    applyPrefs();
-
     m_inspector = new WebInspector(splitter);
 #ifndef QT_NO_PROPERTIES
     if (!m_windowOptions.inspectorUrl.isEmpty())
         m_inspector->setProperty("_q_inspectorUrl", m_windowOptions.inspectorUrl);
 #endif
-    m_inspector->setPage(page());
     m_inspector->hide();
     connect(this, SIGNAL(destroyed()), m_inspector, SLOT(deleteLater()));
 
-    if (m_windowOptions.remoteInspectorPort)
-        page()->setProperty("_q_webInspectorServerPort", m_windowOptions.remoteInspectorPort);
-
     // the zoom values are chosen to be like in Mozilla Firefox 3
     if (!m_zoomLevels.count()) {
         m_zoomLevels << 30 << 50 << 67 << 80 << 90;
@@ -100,6 +86,8 @@ void LauncherWindow::init()
     }
 
     grabZoomKeys(true);
+
+    initializeView();
 }
 
 void LauncherWindow::initializeView()
@@ -132,10 +120,24 @@ void LauncherWindow::initializeView()
         m_view = view;
     }
 
+    m_touchMocking = false;
+
+    connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStarted()));
+    connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
+    connect(page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
+            this, SLOT(showLinkHover(const QString&, const QString&)));
+    connect(this, SIGNAL(enteredFullScreenMode(bool)), this, SLOT(toggleFullScreenMode(bool)));
+
+    applyPrefs();
+
+    m_inspector->setPage(page());
+    m_inspector->hide();
+
+    if (m_windowOptions.remoteInspectorPort)
+        page()->setProperty("_q_webInspectorServerPort", m_windowOptions.remoteInspectorPort);
+
     if (url.isValid())
         page()->mainFrame()->load(url);
-
-    m_touchMocking = false;
 }
 
 void LauncherWindow::applyPrefs()
@@ -672,6 +674,8 @@ void LauncherWindow::toggleWebView(bool graphicsBased)
 {
     m_windowOptions.useGraphicsView = graphicsBased;
     initializeView();
+    menuBar()->clear();
+    createChrome();
 }
 
 void LauncherWindow::toggleAcceleratedCompositing(bool toggle)

-- 
WebKit Debian packaging