Changeset 55067 in webkit

Timestamp:

Feb 21, 2010 8:12:46 PM (14 years ago)

Author:

yuzo@google.com

Message:

2010-02-07 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Eric Seidel.

When page-break-{after,before} is set to always, force page breaks even for overflow-specified elements.
RenderBlock::inRootBlockContext() was introduced by Changeset 5611. Although it is a reasonable criteria for choosing an optional page break location, it is not for a mandatory page break as specified by ​http://dev.w3.org/csswg/css3-page/#forced-pg-brk. The method is removed because it is not used anywhere else.
Note: this patch makes page break work for overflow-specified elements. For tables and floated elements, more work is needed.
​https://bugs.webkit.org/show_bug.cgi?id=9526

• printing/page-break-always-for-overflow-expected.txt: Added.
• printing/page-break-always-for-overflow.html: Added.
• printing/script-tests/page-break-always-for-overflow.js: Added.

2010-02-07 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Eric Seidel.

When page-break-{after,before} is set to always, force page breaks even for overflow-specified elements.
RenderBlock::inRootBlockContext() was introduced by Changeset 5611. Although it is a reasonable criteria for choosing an optional page break location, it is not for a mandatory page break as specified by ​http://dev.w3.org/csswg/css3-page/#forced-pg-brk. The method is removed because it is not used anywhere else.
Note: this patch makes page break work for overflow-specified elements. For tables and floated elements, more work is needed.
​https://bugs.webkit.org/show_bug.cgi?id=9526

Test: printing/page-break-always-for-overflow.html

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintChildren):
• rendering/RenderBlock.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/printing/page-break-always-for-overflow-expected.txt (added)
• LayoutTests/printing/page-break-always-for-overflow.html (added)
• LayoutTests/printing/script-tests/page-break-always-for-overflow.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (4 diffs)
• WebCore/rendering/RenderBlock.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-02-07  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Eric Seidel.
+
+        When page-break-{after,before} is set to always, force page breaks even for overflow-specified elements.
+        RenderBlock::inRootBlockContext() was introduced by Changeset 5611. Although it is a reasonable criteria for choosing an optional page break location, it is not for a mandatory page break as specified by http://dev.w3.org/csswg/css3-page/#forced-pg-brk. The method is removed because it is not used anywhere else.
+        Note: this patch makes page break work for overflow-specified elements. For tables and floated elements, more work is needed.
+        https://bugs.webkit.org/show_bug.cgi?id=9526
+
+        * printing/page-break-always-for-overflow-expected.txt: Added.
+        * printing/page-break-always-for-overflow.html: Added.
+        * printing/script-tests/page-break-always-for-overflow.js: Added.
+
 2010-02-19  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-07  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Eric Seidel.
+
+        When page-break-{after,before} is set to always, force page breaks even for overflow-specified elements.
+        RenderBlock::inRootBlockContext() was introduced by Changeset 5611. Although it is a reasonable criteria for choosing an optional page break location, it is not for a mandatory page break as specified by http://dev.w3.org/csswg/css3-page/#forced-pg-brk. The method is removed because it is not used anywhere else.
+        Note: this patch makes page break work for overflow-specified elements. For tables and floated elements, more work is needed.
+        https://bugs.webkit.org/show_bug.cgi?id=9526
+
+        Test: printing/page-break-always-for-overflow.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintChildren):
+        * rendering/RenderBlock.h:
+
 2010-02-21  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1658 +1658 @@
     for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {        
         // Check for page-break-before: always, and if it's set, break and bail.
-        if (isPrinting && !childrenInline() && child->style()->pageBreakBefore() == PBALWAYS &&
-            inRootBlockContext() && (ty + child->y()) > paintInfo.rect.y() && 
-            (ty + child->y()) < paintInfo.rect.bottom()) {
+        if (isPrinting && !childrenInline() && child->style()->pageBreakBefore() == PBALWAYS
+            && (ty + child->y()) > paintInfo.rect.y()
+            && (ty + child->y()) < paintInfo.rect.bottom()) {
             view()->setBestTruncatedAt(ty + child->y(), this, true);
             return;
@@ -1667 +1667 @@
         // Check for page-break-inside: avoid, and it it's set, break and bail.
         if (isPrinting && !childrenInline() && child->style()->pageBreakInside() == PBAVOID
-            && inRootBlockContext()
             && ty + child->y() > paintInfo.rect.y()
             && ty + child->y() < paintInfo.rect.bottom()
@@ -1679 +1678 @@
 
         // Check for page-break-after: always, and if it's set, break and bail.
-        if (isPrinting && !childrenInline() && child->style()->pageBreakAfter() == PBALWAYS && 
-            inRootBlockContext() && (ty + child->y() + child->height()) > paintInfo.rect.y() && 
-            (ty + child->y() + child->height()) < paintInfo.rect.bottom()) {
+        if (isPrinting && !childrenInline() && child->style()->pageBreakAfter() == PBALWAYS
+            && (ty + child->y() + child->height()) > paintInfo.rect.y()
+            && (ty + child->y() + child->height()) < paintInfo.rect.bottom()) {
             view()->setBestTruncatedAt(ty + child->y() + child->height() + max(0, child->collapsedMarginBottom()), this, true);
             return;
@@ -4711 +4710 @@
 }
 
-bool RenderBlock::inRootBlockContext() const
-{
-    if (isTableCell() || isFloatingOrPositioned() || hasOverflowClip())
-        return false;
-    
-    if (isRoot() || isRenderView())
-        return true;
-    
-    return containingBlock()->inRootBlockContext();
-}
-
 // Helper methods for obtaining the last line, computing line counts and heights for line counts
 // (crawling into blocks).

trunk/WebCore/rendering/RenderBlock.h

@@ -318 +318 @@
     // children.
     virtual RenderBlock* firstLineBlock() const;
-    bool inRootBlockContext() const;
 
     virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth);