Changeset 69336 in webkit

Timestamp:

Oct 7, 2010 1:59:40 PM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/8142645> REGRESSION (r47440): Printing Mail messages with large fonts does not fill page
​https://bugs.webkit.org/show_bug.cgi?id=47374

Reviewed by Simon Fraser.

In the legacy (paint-time pagination) printing model, when there are overlapping lines,
adjustPageHeightDeprecated() was not idempotent, since the truncation point imposed by line n,
namely the top of line n, was above the bottom of line n-1, so in the next round, line n-1
moved the truncation point up again.

• rendering/RenderLineBoxList.cpp:

(WebCore::RenderLineBoxList::paint): Consider the top of the next line when deciding if the
current line extends below the truncation point.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLineBoxList.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/8142645> REGRESSION (r47440): Printing Mail messages with large fonts does not fill page
+        https://bugs.webkit.org/show_bug.cgi?id=47374
+
+        In the legacy (paint-time pagination) printing model, when there are overlapping lines,
+        adjustPageHeightDeprecated() was not idempotent, since the truncation point imposed by line n,
+        namely the top of line n, was above the bottom of line n-1, so in the next round, line n-1
+        moved the truncation point up again.
+
+        * rendering/RenderLineBoxList.cpp:
+        (WebCore::RenderLineBoxList::paint): Consider the top of the next line when deciding if the
+        current line extends below the truncation point.
+
 2010-10-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/rendering/RenderLineBoxList.cpp

@@ -204 +204 @@
             if (bottomForPaginationCheck - topForPaginationCheck <= v->printRect().height()) {
                 if (ty + bottomForPaginationCheck > v->printRect().bottom()) {
+                    if (RootInlineBox* nextRootBox = curr->root()->nextRootBox())
+                        bottomForPaginationCheck = min(bottomForPaginationCheck, min(nextRootBox->topVisibleOverflow(), nextRootBox->lineTop()));
+                }
+                if (ty + bottomForPaginationCheck > v->printRect().bottom()) {
                     if (ty + topForPaginationCheck < v->truncatedAt())
                         v->setBestTruncatedAt(ty + topForPaginationCheck, renderer);