[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 5452649ef8c815b8264633b359b52dd637197def
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 15:57:13 2010 +0000

    2010-08-11  Antonio Gomes  <tonikitoo at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] QtTestBrowser: switching between QWebView and QGraphicsWebView modes is broken
            https://bugs.webkit.org/show_bug.cgi?id=43851
    
            All window options data (including the bool holding if the view is either QWebView or
            QGraphicsWebView based) is stored in m_windowOptions, a class member of LauncherWindow.
            When toggle the view from QWebView to QGraphicsWebView based (and vice-versa), we were
            not updating LauncherWindow::WindowOptions::m_useGraphicsView bit, and then things were
            getting broken.
    
            Patch addresses this issue.
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::createChrome):
            (LauncherWindow::toggleWebView):
            (LauncherWindow::toggleAcceleratedCompositing):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65160 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fcaf05f..f7c583c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-08-11  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] QtTestBrowser: switching between QWebView and QGraphicsWebView modes is broken
+        https://bugs.webkit.org/show_bug.cgi?id=43851
+
+        All window options data (including the bool holding if the view is either QWebView or
+        QGraphicsWebView based) is stored in m_windowOptions, a class member of LauncherWindow.
+        When toggle the view from QWebView to QGraphicsWebView based (and vice-versa), we were
+        not updating LauncherWindow::WindowOptions::m_useGraphicsView bit, and then things were
+        getting broken.
+
+        Patch addresses this issue.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::createChrome):
+        (LauncherWindow::toggleWebView):
+        (LauncherWindow::toggleAcceleratedCompositing):
+
 2010-08-10  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index 095a984..4014ce9 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -218,7 +218,7 @@ void LauncherWindow::createChrome()
 
     QMenu* toolsMenu = menuBar()->addMenu("&Develop");
     QMenu* graphicsViewMenu = toolsMenu->addMenu("QGraphicsView");
-    QAction* toggleGraphicsView = graphicsViewMenu->addAction("Toggle use of QGraphicsView", this, SLOT(initializeView()));
+    QAction* toggleGraphicsView = graphicsViewMenu->addAction("Toggle use of QGraphicsView", this, SLOT(toggleWebView(bool)));
     toggleGraphicsView->setCheckable(true);
     toggleGraphicsView->setChecked(isGraphicsBased());
 
@@ -669,6 +669,12 @@ void LauncherWindow::setTouchMocking(bool on)
 #endif
 }
 
+void LauncherWindow::toggleWebView(bool graphicsBased)
+{
+    m_windowOptions.useGraphicsView = graphicsBased;
+    initializeView();
+}
+
 void LauncherWindow::toggleAcceleratedCompositing(bool toggle)
 {
     m_windowOptions.useCompositing = toggle;
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.h b/WebKitTools/QtTestBrowser/launcherwindow.h
index 9319d24..a3db8ad 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.h
+++ b/WebKitTools/QtTestBrowser/launcherwindow.h
@@ -151,6 +151,7 @@ protected slots:
     void initializeView();
 
     void setTouchMocking(bool on);
+    void toggleWebView(bool graphicsBased);
     void toggleAcceleratedCompositing(bool toggle);
     void toggleTiledBackingStore(bool toggle);
     void toggleResizesToContents(bool toggle);

-- 
WebKit Debian packaging