Changeset 54929 in webkit

Timestamp:

Feb 17, 2010, 9:55:17 PM (15 years ago)

Author:

[email protected]

Message:

2010-02-17 Hayato Ito <​[email protected]>

Reviewed by Eric Seidel.

Support CSS page-break-inside with a value of 'avoid'.

​https://bugs.webkit.org/show_bug.cgi?id=34080

• printing/page-break-inside-expected.txt: Added.
• printing/page-break-inside.html: Added.
• printing/script-tests/page-break-inside.js: Added. (createParagraph): (pageNumber):

2010-02-17 Hayato Ito <​[email protected]>

Reviewed by Eric Seidel.

Support CSS page-break-inside with a value of 'avoid'.

​https://bugs.webkit.org/show_bug.cgi?id=34080

Test: printing/page-break-inside.html

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/printing/page-break-inside-expected.txt (added)
• LayoutTests/printing/page-break-inside.html (added)
• LayoutTests/printing/script-tests/page-break-inside.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-02-17  Hayato Ito  <[email protected]>
+
+        Reviewed by Eric Seidel.
+
+        Support CSS page-break-inside with a value of 'avoid'.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34080
+
+        * printing/page-break-inside-expected.txt: Added.
+        * printing/page-break-inside.html: Added.
+        * printing/script-tests/page-break-inside.js: Added.
+        (createParagraph):
+        (pageNumber):
+
 2010-02-17  Fumitoshi Ukai  <[email protected]>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-17  Hayato Ito  <[email protected]>
+
+        Reviewed by Eric Seidel.
+
+        Support CSS page-break-inside with a value of 'avoid'.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34080
+
+        Test: printing/page-break-inside.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintChildren):
+
 2010-02-17  Fumitoshi Ukai  <[email protected]>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1661 +1661 @@
             inRootBlockContext() && (ty + child->y()) > paintInfo.rect.y() && 
             (ty + child->y()) < paintInfo.rect.bottom()) {
+            view()->setBestTruncatedAt(ty + child->y(), this, true);
+            return;
+        }
+
+        // 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()
+            && ty + child->y() + child->height() > paintInfo.rect.bottom()) {
             view()->setBestTruncatedAt(ty + child->y(), this, true);
             return;