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

[robert at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit cf1df4a7ed9ce40fb7346f323f973b934881917e
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 13 10:59:20 2010 +0000

    2010-03-12  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Adam Barth.
    
            Amend incorrect typo patch for QtLauncher.
    
            https://bugs.webkit.org/show_bug.cgi?id=35877
    
            * QtLauncher/webview.cpp:
            (WebViewGraphicsBased::setFrameRateMeasurementEnabled):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55961 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f88f21a..c36781d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-12  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Amend incorrect typo patch for QtLauncher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35877
+
+        * QtLauncher/webview.cpp:
+        (WebViewGraphicsBased::setFrameRateMeasurementEnabled):
+
 2010-03-13  Victor Wang  <victorw at chromium.org>
 
         Add appengine app to host and serve webkit layout test results.
diff --git a/WebKitTools/QtLauncher/webview.cpp b/WebKitTools/QtLauncher/webview.cpp
index ba1c9b8..dc2fa7b 100644
--- a/WebKitTools/QtLauncher/webview.cpp
+++ b/WebKitTools/QtLauncher/webview.cpp
@@ -87,7 +87,8 @@ void WebViewGraphicsBased::resizeEvent(QResizeEvent* event)
 
 void WebViewGraphicsBased::setFrameRateMeasurementEnabled(bool enabled)
 {
-    if (m_measureFps == enabled) {
+    m_measureFps = enabled;
+    if (m_measureFps) {
         m_lastConsultTime = m_startTime = QTime::currentTime();
         m_updateTimer->start();
     } else 

-- 
WebKit Debian packaging