[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 99bba796bbfdcbd8427a224398ab0221967ae61c
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 19:26:42 2010 +0000

    2010-03-10  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Holger Freyther.
    
            QtLauncher: Fix typo in conditional statement in
                        WebViewGraphicsBased::setFrameRateMeasurementEnabled.
    
            '=' should be '=='!
    
            https://bugs.webkit.org/show_bug.cgi?id=35877
    
            * QtLauncher/webview.cpp:
            (WebViewGraphicsBased::setFrameRateMeasurementEnabled):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55791 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d352274..0ba7204 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-10  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        QtLauncher: Fix typo in conditional statement in
+                    WebViewGraphicsBased::setFrameRateMeasurementEnabled.
+
+        '=' should be '=='!
+
+        https://bugs.webkit.org/show_bug.cgi?id=35877
+
+        * QtLauncher/webview.cpp:
+        (WebViewGraphicsBased::setFrameRateMeasurementEnabled):
+
 2010-03-10  Chris Jerdonek  <cjerdonek at webkit.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebKitTools/QtLauncher/webview.cpp b/WebKitTools/QtLauncher/webview.cpp
index 9252c89..ba1c9b8 100644
--- a/WebKitTools/QtLauncher/webview.cpp
+++ b/WebKitTools/QtLauncher/webview.cpp
@@ -87,7 +87,7 @@ void WebViewGraphicsBased::resizeEvent(QResizeEvent* event)
 
 void WebViewGraphicsBased::setFrameRateMeasurementEnabled(bool enabled)
 {
-    if (m_measureFps = enabled) {
+    if (m_measureFps == enabled) {
         m_lastConsultTime = m_startTime = QTime::currentTime();
         m_updateTimer->start();
     } else 

-- 
WebKit Debian packaging