Changeset 61065 in webkit

Timestamp:

Jun 12, 2010 1:05:08 PM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/7882140> -webkit-column-break-* properties don’t do anything
​https://bugs.webkit.org/show_bug.cgi?id=40531

Reviewed by Dave Hyatt.

WebCore:

Test: fast/multicol/break-properties.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paintChildren): Check for -webkit-column-break-{before,after}: always
and -webkit-column-break-inside: avoid when doing column layout.

LayoutTests:

• fast/multicol/break-properties-expected.txt: Added.
• fast/multicol/break-properties.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/break-properties-expected.txt (added)
• LayoutTests/fast/multicol/break-properties.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-12  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        <rdar://problem/7882140> -webkit-column-break-* properties don’t do anything
+        https://bugs.webkit.org/show_bug.cgi?id=40531
+
+        * fast/multicol/break-properties-expected.txt: Added.
+        * fast/multicol/break-properties.html: Added.
+
 2010-06-13  Robert Hogan  <robert@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-12  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        <rdar://problem/7882140> -webkit-column-break-* properties don’t do anything
+        https://bugs.webkit.org/show_bug.cgi?id=40531
+
+        Test: fast/multicol/break-properties.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintChildren): Check for -webkit-column-break-{before,after}: always
+        and -webkit-column-break-inside: avoid when doing column layout.
+
 2010-06-13  Robert Hogan  <robert@webkit.org>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -2102 +2102 @@
     info.paintingRoot = paintingRootForChildren(paintInfo);
     bool checkPageBreaks = document()->printing() && !document()->settings()->paginateDuringLayoutEnabled();
+    bool checkColumnBreaks = !checkPageBreaks && !view()->printRect().isEmpty() && !document()->settings()->paginateDuringLayoutEnabled();
 
     for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {        
         // Check for page-break-before: always, and if it's set, break and bail.
-        if (checkPageBreaks && !childrenInline() && child->style()->pageBreakBefore() == PBALWAYS
+        bool checkBeforeAlways = !childrenInline() && (checkPageBreaks && child->style()->pageBreakBefore() == PBALWAYS || checkColumnBreaks && child->style()->columnBreakBefore() == PBALWAYS);
+        if (checkBeforeAlways
             && (ty + child->y()) > paintInfo.rect.y()
             && (ty + child->y()) < paintInfo.rect.bottom()) {
@@ -2113 +2115 @@
 
         // Check for page-break-inside: avoid, and it it's set, break and bail.
-        if (checkPageBreaks && !childrenInline() && child->style()->pageBreakInside() == PBAVOID
+        bool checkInsideAvoid = !childrenInline() && (checkPageBreaks && child->style()->pageBreakInside() == PBAVOID || checkColumnBreaks && child->style()->columnBreakInside() == PBAVOID);
+        if (checkInsideAvoid
             && ty + child->y() > paintInfo.rect.y()
             && ty + child->y() < paintInfo.rect.bottom()
@@ -2125 +2128 @@
 
         // Check for page-break-after: always, and if it's set, break and bail.
-        if (checkPageBreaks && !childrenInline() && child->style()->pageBreakAfter() == PBALWAYS
+        bool checkAfterAlways = !childrenInline() && (checkPageBreaks && child->style()->pageBreakAfter() == PBALWAYS || checkColumnBreaks && child->style()->columnBreakAfter() == PBALWAYS);
+        if (checkAfterAlways
             && (ty + child->y() + child->height()) > paintInfo.rect.y()
             && (ty + child->y() + child->height()) < paintInfo.rect.bottom()) {