Changeset 65165 in webkit

Timestamp:

Aug 11, 2010 11:01:57 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-08-11 Antonio Gomes <​tonikitoo@webkit.org>

Reviewed by Ariya Hidayat.

[Qt] QtTestBrowser: after switching between QWebView and QGraphicsWebView, rotation actions get broken
​https://bugs.webkit.org/show_bug.cgi?id=43853

LauncherWindow::createChrome is connecting menu itens to WebViewGraphicsBased's slots directly.
It behaviors badly when user launches the QtTestBrowser in QWebView mode, since then switching to
QGraphicsWebView mode, createChrome is not called again, and menu items end up not getting connected
to slots at all.

• QtTestBrowser/launcherwindow.cpp: (LauncherWindow::createChrome): (LauncherWindow::animatedFlip): (LauncherWindow::animatedYFlip):
• QtTestBrowser/launcherwindow.h:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-11  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] QtTestBrowser: after switching between QWebView and QGraphicsWebView, rotation actions get broken
+        https://bugs.webkit.org/show_bug.cgi?id=43853
+
+        LauncherWindow::createChrome is connecting menu itens to WebViewGraphicsBased's slots directly.
+        It behaviors badly when user launches the QtTestBrowser in QWebView mode, since then switching to
+        QGraphicsWebView mode, createChrome is not called again, and menu items end up not getting connected
+        to slots at all.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::createChrome):
+        (LauncherWindow::animatedFlip):
+        (LauncherWindow::animatedYFlip):
+        * QtTestBrowser/launcherwindow.h:
+
 2010-08-11  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKitTools/QtTestBrowser/launcherwindow.cpp

@@ -340 +340 @@
     flipAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
     flipAnimated->setEnabled(isGraphicsBased());
+    connect(flipAnimated, SIGNAL(triggered()), SLOT(animatedFlip()));
 
     QAction* flipYAnimated = graphicsViewMenu->addAction("Animated Y-Flip");
     flipYAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
     flipYAnimated->setEnabled(isGraphicsBased());
-
-    if (isGraphicsBased()) {
-        WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view);
-        connect(flipAnimated, SIGNAL(triggered()), view, SLOT(animatedFlip()));
-        connect(flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
-    }
+    connect(flipYAnimated, SIGNAL(triggered()), SLOT(animatedYFlip()));
 
     QAction* cloneWindow = graphicsViewMenu->addAction("Clone Window", this, SLOT(cloneWindow()));
@@ -699 +695 @@
 }
 
+void LauncherWindow::animatedFlip()
+{
+    qobject_cast<WebViewGraphicsBased*>(m_view)->animatedFlip();
+}
+
+void LauncherWindow::animatedYFlip()
+{
+    qobject_cast<WebViewGraphicsBased*>(m_view)->animatedYFlip();
+}
 void LauncherWindow::toggleSpatialNavigation(bool b)
 {

trunk/WebKitTools/QtTestBrowser/launcherwindow.h

@@ -168 +168 @@
 
     void changeViewportUpdateMode(int mode);
+    void animatedFlip();
+    void animatedYFlip();
     void selectElements();
     void showFPS(bool enable);