Changeset 88556 in webkit

Timestamp:

Jun 10, 2011, 12:44:39 PM (15 years ago)

Author:

eae@chromium.org

Message:

2011-06-10 Emil A Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

Regression r85573: Blank pages appear at the end of some wikipedia documents.
​https://bugs.webkit.org/show_bug.cgi?id=62343

Fix regression caused by r85573. Cached document size not updated after layout.

• platform/chromium-linux/printing/page-count-relayout-shrink-expected.txt: Added.
• platform/mac/printing/page-count-relayout-shrink-expected.txt: Added.
• printing/page-count-relayout-shrink.html: Added.

2011-06-10 Emil A Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

Regression r85573: Blank pages appear at the end of some wikipedia documents.
​https://bugs.webkit.org/show_bug.cgi?id=62343

Fix regression caused by r85573. Cached document size not updated after layout.

Test: printing/page-count-relayout-shrink.html

• page/FrameView.cpp: (WebCore::FrameView::forceLayoutForPagination):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-linux/printing/page-count-relayout-shrink-expected.txt (added)
• LayoutTests/platform/mac/printing/page-count-relayout-shrink-expected.txt (added)
• LayoutTests/printing/page-count-relayout-shrink.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-10  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Regression r85573: Blank pages appear at the end of some wikipedia documents.
+        https://bugs.webkit.org/show_bug.cgi?id=62343
+
+        Fix regression caused by r85573. Cached document size not updated after layout.
+
+        * platform/chromium-linux/printing/page-count-relayout-shrink-expected.txt: Added.
+        * platform/mac/printing/page-count-relayout-shrink-expected.txt: Added.
+        * printing/page-count-relayout-shrink.html: Added.
+
 2011-06-10  Rob Buis  <rbuis@rim.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-10  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Regression r85573: Blank pages appear at the end of some wikipedia documents.
+        https://bugs.webkit.org/show_bug.cgi?id=62343
+
+        Fix regression caused by r85573. Cached document size not updated after layout.
+
+        Test: printing/page-count-relayout-shrink.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::forceLayoutForPagination):
+
 2011-06-10  Rob Buis  <rbuis@rim.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2605 +2605 @@
         // FIXME: We are assuming a shrink-to-fit printing implementation.  A cropping
         // implementation should not do this!
-        const IntRect& documentRect = root->documentRect();
         bool horizontalWritingMode = root->style()->isHorizontalWritingMode();
-        int docLogicalWidth = horizontalWritingMode ? documentRect.width() : documentRect.height();
+        int docLogicalWidth = horizontalWritingMode ? root->documentRect().width() : root->documentRect().height();
         if (docLogicalWidth > pageLogicalWidth) {
             flooredPageLogicalWidth = std::min<int>(docLogicalWidth, pageLogicalWidth * maximumShrinkFactor);
@@ -2615 +2614 @@
             root->setNeedsLayoutAndPrefWidthsRecalc();
             forceLayout();
+            const IntRect& documentRect = root->documentRect();
             int docLogicalHeight = horizontalWritingMode ? documentRect.height() : documentRect.width();
             int docLogicalTop = horizontalWritingMode ? documentRect.y() : documentRect.x();