Changeset 108528 in webkit

Timestamp:

Feb 22, 2012, 11:37:26 AM (13 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r62632): page-break-inside: avoid is ignored
​https://bugs.webkit.org/show_bug.cgi?id=79262

Reviewed by Adele Peterson.

Source/WebCore:

This was disabled in r62632 because of <​http://webkit.org/b/41532>. Changes to the
pagination code since then have invalidated that bug, so enabling the feature again does not
re-introduce the bug.

Updated expected results for printing/page-break-inside-avoid.html.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::adjustForUnsplittableChild):

LayoutTests:

• printing/page-break-inside-avoid-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/printing/page-break-inside-avoid-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (2 diffs)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-22  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r62632): page-break-inside: avoid is ignored
+        https://bugs.webkit.org/show_bug.cgi?id=79262
+
+        Reviewed by Adele Peterson.
+
+        * printing/page-break-inside-avoid-expected.txt:
+
 2012-02-22  Adrienne Walker  <enne@google.com>
 

trunk/LayoutTests/printing/page-break-inside-avoid-expected.txt

@@ -9 +9 @@
 PASS: page number of "page2" is 2
 PASS: page number of "page3" is 3
-FAIL: expected page number of "page4" is 4. Was 3
+PASS: page number of "page4" is 4
 PASS: page number of "page5" is 5
 PASS: page number of "page8" is 8
@@ -15 +15 @@
 PASS: page number of "page9-2" is 9
 PASS: page number of "page10" is 10
+All tests passed
 
 PASS successfullyParsed is true

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-22  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r62632): page-break-inside: avoid is ignored
+        https://bugs.webkit.org/show_bug.cgi?id=79262
+
+        Reviewed by Adele Peterson.
+
+        This was disabled in r62632 because of <http://webkit.org/b/41532>. Changes to the
+        pagination code since then have invalidated that bug, so enabling the feature again does not
+        re-introduce the bug.
+
+        Updated expected results for printing/page-break-inside-avoid.html.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::adjustForUnsplittableChild):
+
 2012-02-22  Philippe Normand  <pnormand@igalia.com>
 
@@ -4263 +4279 @@
 2012-02-19  James Robinson  <jamesr@chromium.org>
 
-        Sort WebCore XCode project files with sort-Xcode-project-files script. Unreviewed.
+        Sort WebCore Xcode project files with sort-Xcode-project-files script. Unreviewed.
 
         * WebCore.xcodeproj/project.pbxproj:

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -6585 +6585 @@
 LayoutUnit RenderBlock::adjustForUnsplittableChild(RenderBox* child, LayoutUnit logicalOffset, bool includeMargins)
 {
-    bool isUnsplittable = child->isUnsplittableForPagination() || child->style()->columnBreakInside() == PBAVOID
-        || child->style()->regionBreakInside() == PBAVOID;
+    bool checkColumnBreaks = view()->layoutState()->isPaginatingColumns();
+    bool checkPageBreaks = !checkColumnBreaks && view()->layoutState()->m_pageLogicalHeight;
+    bool checkRegionBreaks = inRenderFlowThread();
+    bool isUnsplittable = child->isUnsplittableForPagination() || (checkColumnBreaks && child->style()->columnBreakInside() == PBAVOID)
+        || (checkPageBreaks && child->style()->pageBreakInside() == PBAVOID)
+        || (checkRegionBreaks && child->style()->regionBreakInside() == PBAVOID);
     if (!isUnsplittable)
         return logicalOffset;