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

[tonikitoo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3739df669386848e4c0a99a10efc10dae2c651bb
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 18:01:57 2010 +0000

    2010-08-11  Antonio Gomes  <tonikitoo at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65165 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f7c583c..0aa140d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,23 @@
 2010-08-11  Antonio Gomes  <tonikitoo at 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 at webkit.org>
+
         Reviewed by Simon Hausmann.
 
         [Qt] QtTestBrowser: switching between QWebView and QGraphicsWebView modes is broken
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index 4014ce9..a6f17d1 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -339,16 +339,12 @@ void LauncherWindow::createChrome()
     QAction* flipAnimated = graphicsViewMenu->addAction("Animated Flip");
     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()));
     cloneWindow->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
@@ -698,6 +694,15 @@ void LauncherWindow::toggleWebGL(bool toggle)
     page()->settings()->setAttribute(QWebSettings::WebGLEnabled, toggle);
 }
 
+void LauncherWindow::animatedFlip()
+{
+    qobject_cast<WebViewGraphicsBased*>(m_view)->animatedFlip();
+}
+
+void LauncherWindow::animatedYFlip()
+{
+    qobject_cast<WebViewGraphicsBased*>(m_view)->animatedYFlip();
+}
 void LauncherWindow::toggleSpatialNavigation(bool b)
 {
     page()->settings()->setAttribute(QWebSettings::SpatialNavigationEnabled, b);
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.h b/WebKitTools/QtTestBrowser/launcherwindow.h
index a3db8ad..f4ef139 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.h
+++ b/WebKitTools/QtTestBrowser/launcherwindow.h
@@ -167,6 +167,8 @@ protected slots:
 #endif
 
     void changeViewportUpdateMode(int mode);
+    void animatedFlip();
+    void animatedYFlip();
     void selectElements();
     void showFPS(bool enable);
     void showUserAgentDialog();

-- 
WebKit Debian packaging