Changeset 84442 in webkit

Timestamp:

Apr 20, 2011 5:35:24 PM (13 years ago)

Author:

weinig@apple.com

Message:

2011-04-20 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

WebKit2: Can't scroll page after printing on Yahoo.com and other sites
<rdar://problem/9233291>
​https://bugs.webkit.org/show_bug.cgi?id=59049

• page/Frame.cpp: (WebCore::Frame::setPrinting): Match Mac WebKit1 code when ending printing, and call forceLayout() instead of forceLayoutForPagination().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Frame.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-20  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        WebKit2: Can't scroll page after printing on Yahoo.com and other sites
+        <rdar://problem/9233291>
+        https://bugs.webkit.org/show_bug.cgi?id=59049
+
+        * page/Frame.cpp:
+        (WebCore::Frame::setPrinting): Match Mac WebKit1 code when ending printing,
+        and call forceLayout() instead of forceLayoutForPagination().
+
 2011-04-20  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/page/Frame.cpp

@@ -508 +508 @@
 
     m_doc->styleSelectorChanged(RecalcStyleImmediately);
-    view()->forceLayoutForPagination(pageSize, maximumShrinkRatio, shouldAdjustViewSize);
+    if (printing)
+        view()->forceLayoutForPagination(pageSize, maximumShrinkRatio, shouldAdjustViewSize);
+    else {
+        view()->forceLayout();
+        if (shouldAdjustViewSize == AdjustViewSize)
+            view()->adjustViewSize();
+    }
 
     // Subframes of the one we're printing don't lay out to the page size.