[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6c64449636dc5941ff2b5bc2960fbfd703533c9d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 13 09:38:05 2010 +0000

    2010-03-13  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Add "Show FPS" menu option to QtLauncher.
    
            [Qt] QtLauncher need a menu option to show/hide FPS
            https://bugs.webkit.org/show_bug.cgi?id=35794
    
            * QtLauncher/main.cpp:
            (LauncherWindow::showFPS):
            (LauncherWindow::createChrome):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4e32661..4195703 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        Add "Show FPS" menu option to QtLauncher.
+
+        [Qt] QtLauncher need a menu option to show/hide FPS
+        https://bugs.webkit.org/show_bug.cgi?id=35794
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::showFPS):
+        (LauncherWindow::createChrome):
+
+2010-03-13  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         Add a "Toggle FullScreen" option to QtLauncher Menu.
 
         [Qt] QtLauncher needs an option to toggle FullScreen Mode
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index 77dbc6e..6785ec8 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -121,6 +121,7 @@ protected slots:
     void initializeView(bool useGraphicsView = false);
     void toggleSpatialNavigation(bool b);
     void toggleFullScreenMode(bool enable);
+    void showFPS(bool enable);
 
 public slots:
     void newWindow();
@@ -583,6 +584,16 @@ void LauncherWindow::toggleFullScreenMode(bool enable)
     }
 }
 
+void LauncherWindow::showFPS(bool enable)
+{
+    if (!isGraphicsBased())
+        return;
+
+    gShowFrameRate = enable;
+    WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view);
+    view->setFrameRateMeasurementEnabled(enable);
+}
+
 void LauncherWindow::newWindow()
 {
     LauncherWindow* mw = new LauncherWindow(this, false);
@@ -710,6 +721,12 @@ void LauncherWindow::createChrome()
     QAction* cloneWindow = graphicsViewMenu->addAction("Clone Window", this, SLOT(cloneWindow()));
     cloneWindow->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
     cloneWindow->setEnabled(isGraphicsBased());
+
+    QAction* showFPS = graphicsViewMenu->addAction("Show FPS", this, SLOT(showFPS(bool)));
+    showFPS->setCheckable(true);
+    showFPS->setEnabled(isGraphicsBased());
+    showFPS->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+    showFPS->setChecked(gShowFrameRate);
 }
 
 QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)

-- 
WebKit Debian packaging