Changeset 81970 in webkit

Timestamp:

Mar 25, 2011 10:49:11 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-03-25 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Adele Peterson.

REGRESSION(r77257): Only first page of a document is printed
​https://bugs.webkit.org/show_bug.cgi?id=56958

• printing/page-count-layout-overflow-expected.txt: Added.
• printing/page-count-layout-overflow.html: Added.

2011-03-25 Dave Hyatt <​hyatt@apple.com>

Reviewed by Adele Peterson.

REGRESSION(r77257): Only first page of a document is printed
​https://bugs.webkit.org/show_bug.cgi?id=56958

Test: printing/page-count-layout-overflow.html

• page/FrameView.cpp: (WebCore::FrameView::forceLayoutForPagination): Moved clearing of overflow

to the right place.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/printing/page-count-layout-overflow-expected.txt (added)
• LayoutTests/printing/page-count-layout-overflow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-25  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Adele Peterson.
+
+        REGRESSION(r77257): Only first page of a document is printed
+        https://bugs.webkit.org/show_bug.cgi?id=56958
+
+        * printing/page-count-layout-overflow-expected.txt: Added.
+        * printing/page-count-layout-overflow.html: Added.
+
 2011-03-25  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-25  Dave Hyatt  <hyatt@apple.com>
+
+        Reviewed by Adele Peterson.
+
+        REGRESSION(r77257): Only first page of a document is printed
+        https://bugs.webkit.org/show_bug.cgi?id=56958
+
+        Test: printing/page-count-layout-overflow.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::forceLayoutForPagination): Moved clearing of overflow
+            to the right place.
+
 2011-03-25  Benjamin Poulain  <benjamin.poulain@nokia.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2421 +2421 @@
             root->setNeedsLayoutAndPrefWidthsRecalc();
             forceLayout();
-            root->clearLayoutOverflow();
             int docLogicalHeight = root->style()->isHorizontalWritingMode() ? root->docHeight() : root->docWidth();
             int docLogicalTop = root->style()->isHorizontalWritingMode() ? root->docTop() : root->docLeft();
@@ -2431 +2430 @@
             if (!root->style()->isHorizontalWritingMode())
                 overflow = overflow.transposedRect();
+            root->clearLayoutOverflow();
             root->addLayoutOverflow(overflow); // This is how we clip in case we overflow again.
         }