Changeset 56553 in webkit

Timestamp:

Mar 25, 2010 10:18:07 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

Not displaying FPS info on the terminal. On S60 and Maemo the Window title will be used and Status bar will used on desktop.

Reviewed by Simon Hausmann.
Patch by Jesus Palencia <​jesus.palencia@openbossa.org>

[Qt] QtLauncher's FPS info should not be displayed on the terminal
​https://bugs.webkit.org/show_bug.cgi?id=36244

• QtLauncher/main.cpp:

(LauncherWindow::initializeView):
(LauncherWindow::showFPS):
(LauncherWindow::updateFPS):

• QtLauncher/webview.cpp:

(WebViewGraphicsBased::setFrameRateMeasurementEnabled):
(WebViewGraphicsBased::updateFrameRate):

• QtLauncher/webview.h:

(WebViewGraphicsBased::frameRateMeasurementEnabled):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (4 diffs)
• QtLauncher/webview.cpp (modified) (2 diffs)
• QtLauncher/webview.h (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-22  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        Not displaying FPS info on the terminal. On S60 and Maemo the
+        Window title will be used and Status bar will used on desktop.
+
+        [Qt] QtLauncher's FPS info should not be displayed on the terminal
+        https://bugs.webkit.org/show_bug.cgi?id=36244
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::initializeView):
+        (LauncherWindow::showFPS):
+        (LauncherWindow::updateFPS):
+        * QtLauncher/webview.cpp:
+        (WebViewGraphicsBased::setFrameRateMeasurementEnabled):
+        (WebViewGraphicsBased::updateFrameRate):
+        * QtLauncher/webview.h:
+        (WebViewGraphicsBased::frameRateMeasurementEnabled):
+
 2010-03-25  Diego Gonzalez  <diego.gonzalez@openbossa.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -142 +142 @@
     void newWindow();
     void cloneWindow();
+    void updateFPS(int fps);
 
 signals:
@@ -620 +621 @@
             connect(m_flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
 
+        connect(view, SIGNAL(currentFPSUpdated(int)), this, SLOT(updateFPS(int)));
+
         // The implementation of QAbstractScrollArea::eventFilter makes us need
         // to install the event filter on the viewport of a QGraphicsView.
@@ -658 +661 @@
     WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view);
     view->setFrameRateMeasurementEnabled(enable);
+
+    if (!enable) {
+#ifdef Q_WS_MAEMO_5 && defined(Q_WS_S60)
+        setWindowTitle("");
+#else
+        statusBar()->clearMessage();
+#endif
+    }
 }
 
@@ -687 +698 @@
     LauncherWindow* mw = new LauncherWindow(this, true);
     mw->show();
+}
+
+void LauncherWindow::updateFPS(int fps)
+{
+    QString fpsStatusText = QString("Current FPS: %1").arg(fps);
+
+#ifdef Q_WS_MAEMO_5 && defined(Q_WS_S60)
+    setWindowTitle(fpsStatusText);
+#else
+    statusBar()->showMessage(fpsStatusText);
+#endif
 }
 

trunk/WebKitTools/QtLauncher/webview.cpp

@@ -108 +108 @@
         m_lastConsultTime = m_startTime = QTime::currentTime();
         m_updateTimer->start();
-    } else 
+    } else
         m_updateTimer->stop();
 }
@@ -122 +122 @@
     int current = interval ? m_numPaintsSinceLastMeasure * 1000 / interval : 0;
 
-    qDebug("[FPS] average: %d, current: %d", average, current);
+    emit currentFPSUpdated(current);
 
     m_lastConsultTime = now;

trunk/WebKitTools/QtLauncher/webview.h

@@ -77 +77 @@
 
     void setFrameRateMeasurementEnabled(bool enabled);
-    bool frameRateMeasurementEnabled() { return m_measureFps; } 
+    bool frameRateMeasurementEnabled() const { return m_measureFps; }
 
     virtual void paintEvent(QPaintEvent* event);
-    
+
     void setResizesToContents(bool b);
 
@@ -98 +98 @@
         return m_yRotation;
     }
-    
+
     GraphicsWebView* graphicsWebView() const { return m_item; }
 
@@ -108 +108 @@
 signals:
     void yFlipRequest();
+    void currentFPSUpdated(int fps);
 
 private: