Changeset 76604 in webkit

Timestamp:

Jan 25, 2011 9:54:27 AM (13 years ago)

Author:

mjs@apple.com

Message:

2011-01-25 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Anders Carlsson.

Improve scale factor resetting
​https://bugs.webkit.org/show_bug.cgi?id=53093

Two key changes:

• Don't set the scale factor to what it already is, as this causes an uneeded force layout and scroll
• Don't ever set the scale factor based on a non-main frame committing

This fixes two WebKit2 layout tests.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-25  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Improve scale factor resetting
+        https://bugs.webkit.org/show_bug.cgi?id=53093
+        
+        Two key changes:
+        - Don't set the scale factor to what it already is, as this causes an
+        uneeded force layout and scroll
+        - Don't ever set the scale factor based on a non-main frame committing
+        
+        This fixes two WebKit2 layout tests.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
+
 2011-01-24  Chris Marrin  <cmarrin@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -431 +431 @@
     webPage->send(Messages::WebPageProxy::DidCommitLoadForFrame(m_frame->frameID(), response.mimeType(), m_frameHasCustomRepresentation, PlatformCertificateInfo(response), InjectedBundleUserMessageEncoder(userData.get())));
 
-    // Restore the page scale factor.
-    double newPageScaleFactor = m_frame->coreFrame()->pageScaleFactor();
-    
     // Only restore the scale factor for standard frame loads (of the main frame).
-    if (m_frame->isMainFrame() && m_frame->coreFrame()->loader()->loadType() == FrameLoadTypeStandard)
-        newPageScaleFactor = 1.0;
-
-    webPage->scaleWebView(newPageScaleFactor, IntPoint());
+    if (m_frame->isMainFrame() && m_frame->coreFrame()->loader()->loadType() == FrameLoadTypeStandard) {
+        if (m_frame->coreFrame()->pageScaleFactor() != 1.0)
+            webPage->scaleWebView(1.0, IntPoint());
+    }
 }