Changeset 106395 in webkit

Timestamp:

Jan 31, 2012 2:42:26 PM (12 years ago)

Author:

fsamuel@chromium.org

Message:

[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):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -2031 +2031 @@
     // 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);