[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 526920e707597e9e2433864425b0d02eeb238cdf
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 19:52:58 2009 +0000

    Reviewed By Adam Barth.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-20
    Add some actions to the menu for cursor debugging.
    
    GraphicsView based launcher only.
    
    * QGVLauncher/main.cpp:
    (MainView::setWaitCursor):
    (MainView::resetCursor):
    (MainView::flip):
    (MainWindow::setWaitCursor):
    (MainWindow::resetCursor):
    (MainWindow::buildUI):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49879 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a984239..ea03cbd 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,21 @@
 2009-10-20  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
+        Reviewed By Adam Barth.
+
+        Add some actions to the menu for cursor debugging.
+
+        GraphicsView based launcher only.
+
+        * QGVLauncher/main.cpp:
+        (MainView::setWaitCursor):
+        (MainView::resetCursor):
+        (MainView::flip):
+        (MainWindow::setWaitCursor):
+        (MainWindow::resetCursor):
+        (MainWindow::buildUI):
+
+2009-10-20  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
         Rubberstamped by Adam Barth.
 
         Remove clipRenderToViewport as agreed upon in
diff --git a/WebKit/qt/QGVLauncher/main.cpp b/WebKit/qt/QGVLauncher/main.cpp
index 5800b78..c31e301 100644
--- a/WebKit/qt/QGVLauncher/main.cpp
+++ b/WebKit/qt/QGVLauncher/main.cpp
@@ -90,8 +90,17 @@ public:
         m_mainWidget->setGeometry(rect);
     }
 
-public slots:
-    void flip()
+    void setWaitCursor()
+    {
+        m_mainWidget->setCursor(Qt::WaitCursor);
+    }
+
+    void resetCursor()
+    {
+        m_mainWidget->unsetCursor();
+    }
+
+   void flip()
     {
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
         QSizeF center = m_mainWidget->boundingRect().size() / 2;
@@ -246,6 +255,16 @@ public slots:
         mw->show();
     }
 
+    void setWaitCursor()
+    {
+        view->setWaitCursor();
+    }
+
+    void resetCursor()
+    {
+        view->resetCursor();
+    }
+
     void flip()
     {
         view->flip();
@@ -279,6 +298,10 @@ private:
         viewMenu->addAction(page->action(QWebPage::Stop));
         viewMenu->addAction(page->action(QWebPage::Reload));
 
+        QMenu* testMenu = menuBar()->addMenu("&Tests");
+        testMenu->addAction("Set Wait Cursor", this, SLOT(setWaitCursor()), QKeySequence("Ctrl+W"));
+        testMenu->addAction("Reset Cursor", this, SLOT(resetCursor()), QKeySequence("Ctrl+Shift+W"));
+
         QMenu* fxMenu = menuBar()->addMenu("&Effects");
         fxMenu->addAction("Flip", this, SLOT(flip()));
         fxMenu->addAction("Animated Flip", this, SLOT(animatedFlip()));

-- 
WebKit Debian packaging