[Chromium] ChromeClientImpl::dispatchViewportPropertiesDidChange is repeatedly called...

https://bugs.webkit.org/show_bug.cgi?id=77429

Reviewed by Darin Fisher.

m_webView->isPageScaleFactorSet() is tested in ChromeClientImpl::layoutUpdated, and it is never true,
because WebViewImpl::setPageScaleFactorPreservingScrollOffset is called repeatedly and exits early
and thus never calls WebViewImpl::setPageScaleFactor which sets the flag.

The simplest solution is to simply get rid of the early return in
WebViewImpl::setPageScaleFactorPreservingScrollOffset.

* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setPageScaleFactorPreservingScrollOffset):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106395 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 07ee5e8..51f1b3d 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,5 +1,22 @@
 2012-01-31  Fady Samuel  <fsamuel@chromium.org>
 
+        [Chromium] ChromeClientImpl::dispatchViewportPropertiesDidChange is repeatedly called in Google News
+        https://bugs.webkit.org/show_bug.cgi?id=77429
+
+        Reviewed by Darin Fisher.
+
+        m_webView->isPageScaleFactorSet() is tested in ChromeClientImpl::layoutUpdated, and it is never true, 
+        because WebViewImpl::setPageScaleFactorPreservingScrollOffset is called repeatedly and exits early 
+        and thus never calls WebViewImpl::setPageScaleFactor which sets the flag.
+        
+        The simplest solution is to simply get rid of the early return in 
+        WebViewImpl::setPageScaleFactorPreservingScrollOffset.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setPageScaleFactorPreservingScrollOffset):
+
+2012-01-31  Fady Samuel  <fsamuel@chromium.org>
+
         [Chromium] Expose setLayoutFallbackWidth as a WebSetting
         https://bugs.webkit.org/show_bug.cgi?id=77431
 

diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index d5a8ba8..e9fed27 100644 (file)
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -2030,8 +2030,6 @@ void WebViewImpl::setPageScaleFactorPreservingScrollOffset(float scaleFactor)
 {
     // Pick a scale factor that is within the expected limits
     scaleFactor = clampPageScaleFactorToLimits(scaleFactor);
-    if (scaleFactor == pageScaleFactor())
-        return;
 
     IntPoint scrollOffsetAtNewScale(mainFrame()->scrollOffset().width, mainFrame()->scrollOffset().height);
     float deltaScale = scaleFactor / pageScaleFactor();