Changeset 70417 in webkit

Timestamp:

Oct 24, 2010 9:59:09 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-24 Yi Shen <​yi.4.shen@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):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.cpp (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-24  Yi Shen  <yi.4.shen@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@rim.com>
 

trunk/WebKitTools/QtTestBrowser/launcherwindow.cpp

@@ -71 +71 @@
 #endif
 
+    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->hide();
+    connect(this, SIGNAL(destroyed()), m_inspector, SLOT(deleteLater()));
+
+    // the zoom values are chosen to be like in Mozilla Firefox 3
+    if (!m_zoomLevels.count()) {
+        m_zoomLevels << 30 << 50 << 67 << 80 << 90;
+        m_zoomLevels << 100;
+        m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
+    }
+
+    grabZoomKeys(true);
+
     initializeView();
+}
+
+void LauncherWindow::initializeView()
+{
+    delete m_view;
+
+    QUrl url = page()->mainFrame()->url();
+    setPage(new WebPage(this));
+
+    QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
+
+    if (!m_windowOptions.useGraphicsView) {
+        WebViewTraditional* view = new WebViewTraditional(splitter);
+        view->setPage(page());
+
+        view->installEventFilter(this);
+
+        m_view = view;
+    } else {
+        WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter);
+        view->setPage(page());
+
+        connect(view, SIGNAL(currentFPSUpdated(int)), this, SLOT(updateFPS(int)));
+
+        view->installEventFilter(this);
+        // The implementation of QAbstractScrollArea::eventFilter makes us need
+        // to install the event filter also on the viewport of a QGraphicsView.
+        view->viewport()->installEventFilter(this);
+
+        m_view = view;
+    }
+
+    m_touchMocking = false;
 
     connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStarted()));
@@ -81 +131 @@
     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;
-        m_zoomLevels << 100;
-        m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
-    }
-
-    grabZoomKeys(true);
-}
-
-void LauncherWindow::initializeView()
-{
-    delete m_view;
-
-    QUrl url = page()->mainFrame()->url();
-    setPage(new WebPage(this));
-
-    QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
-
-    if (!m_windowOptions.useGraphicsView) {
-        WebViewTraditional* view = new WebViewTraditional(splitter);
-        view->setPage(page());
-
-        view->installEventFilter(this);
-
-        m_view = view;
-    } else {
-        WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter);
-        view->setPage(page());
-
-        connect(view, SIGNAL(currentFPSUpdated(int)), this, SLOT(updateFPS(int)));
-
-        view->installEventFilter(this);
-        // The implementation of QAbstractScrollArea::eventFilter makes us need
-        // to install the event filter also on the viewport of a QGraphicsView.
-        view->viewport()->installEventFilter(this);
-
-        m_view = view;
-    }
-
     if (url.isValid())
         page()->mainFrame()->load(url);
-
-    m_touchMocking = false;
 }
 
@@ -673 +675 @@
     m_windowOptions.useGraphicsView = graphicsBased;
     initializeView();
+    menuBar()->clear();
+    createChrome();
 }