Changeset 58047 in webkit

Timestamp:

Apr 21, 2010 8:31:54 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QtLauncher: make FPS measurement accurate
​https://bugs.webkit.org/show_bug.cgi?id=37934

Instead of counting paints, which are not interchangeable with frames that
the user sees, we now set an arbitrary timer for FPS measurements. The idea is
that if the main thread is delayed for any reason, that timer would be delayed
as well.

• QtLauncher/QtLauncher.pro:
• QtLauncher/fpstimer.cpp: Added. (FpsTimer::FpsTimer): (FpsTimer::numFrames): (FpsTimer::start): (FpsTimer::stop): (FpsTimer::timerEvent):
• QtLauncher/fpstimer.h: Added.
• QtLauncher/webview.cpp: (WebViewGraphicsBased::setFrameRateMeasurementEnabled): (WebViewGraphicsBased::updateFrameRate): (WebViewGraphicsBased::paintEvent):
• QtLauncher/webview.h:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/QtLauncher.pro (modified) (2 diffs)
• QtLauncher/fpstimer.cpp (added)
• QtLauncher/fpstimer.h (added)
• QtLauncher/webview.cpp (modified) (2 diffs)
• QtLauncher/webview.h (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-21  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QtLauncher: make FPS measurement accurate
+        https://bugs.webkit.org/show_bug.cgi?id=37934
+
+        Instead of counting paints, which are not interchangeable with frames that
+        the user sees, we now set an arbitrary timer for FPS measurements. The idea is
+        that if the main thread is delayed for any reason, that timer would be delayed
+        as well.
+
+        * QtLauncher/QtLauncher.pro:
+        * QtLauncher/fpstimer.cpp: Added.
+        (FpsTimer::FpsTimer):
+        (FpsTimer::numFrames):
+        (FpsTimer::start):
+        (FpsTimer::stop):
+        (FpsTimer::timerEvent):
+        * QtLauncher/fpstimer.h: Added.
+        * QtLauncher/webview.cpp:
+        (WebViewGraphicsBased::setFrameRateMeasurementEnabled):
+        (WebViewGraphicsBased::updateFrameRate):
+        (WebViewGraphicsBased::paintEvent):
+        * QtLauncher/webview.h:
+
 2010-04-21  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/QtLauncher/QtLauncher.pro

@@ -9 +9 @@
     webpage.cpp \
     webview.cpp \
+    fpstimer.cpp \
 
 HEADERS += \
@@ -18 +19 @@
     webpage.h \
     webview.h \
+    fpstimer.h \
 
 CONFIG -= app_bundle

trunk/WebKitTools/QtLauncher/webview.cpp

@@ -107 +107 @@
     if (m_measureFps) {
         m_lastConsultTime = m_startTime = QTime::currentTime();
+        m_fpsTimer.start();
         m_updateTimer->start();
-    } else
+    } else {
+        m_fpsTimer.stop();
         m_updateTimer->stop();
+    }
 }
 
 void WebViewGraphicsBased::updateFrameRate()
 {
-    QTime now = QTime::currentTime();
-
+    const QTime now = QTime::currentTime();
     int interval = m_lastConsultTime.msecsTo(now);
-    int total = m_startTime.msecsTo(now);
-
-    int average = total ? m_numPaintsTotal * 1000 / total : 0;
-    int current = interval ? m_numPaintsSinceLastMeasure * 1000 / interval : 0;
+    int frames = m_fpsTimer.numFrames(interval);
+    int current = interval ? frames * 1000 / interval : 0;
 
     emit currentFPSUpdated(current);
 
     m_lastConsultTime = now;
-    m_numPaintsSinceLastMeasure = 0;
 }
 
@@ -157 +156 @@
     if (!m_measureFps)
         return;
-    m_numPaintsSinceLastMeasure++;
-    m_numPaintsTotal++;
 }
 

trunk/WebKitTools/QtLauncher/webview.h

@@ -34 +34 @@
 #define webview_h
 
+#include "fpstimer.h"
 #include "webpage.h"
 #include <qwebview.h>
@@ -120 +121 @@
     qreal m_yRotation;
     bool m_resizesToContents;
+    FpsTimer m_fpsTimer;
 };