Changeset 62632 in webkit
- Timestamp:
- Jul 7, 2010 1:06:21 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r62630 r62632 1 2010-07-07 Hayato Ito <hayato@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 Rolling out 'page-break-inside:avoid' part of the r54929. 6 Rebased the related layout tests, which are now expected to fail, as well. 7 8 https://bugs.webkit.org/show_bug.cgi?id=41532 9 10 * fast/multicol/break-properties-expected.txt: 11 * printing/page-break-inside-avoid-expected.txt: 12 1 13 2010-07-06 Pavel Feldman <pfeldman@chromium.org> 2 14 -
trunk/LayoutTests/fast/multicol/break-properties-expected.txt
r61065 r62632 1 1 PASS: 'break-before' is at (218, 8) 2 2 PASS: 'after-break' is at (428, 8) 3 PASS: 'no-break' is at (533,8)3 FAIL: 'no-break' is at (428, 68) instead of (533 ,8) 4 4 -
trunk/LayoutTests/printing/page-break-inside-avoid-expected.txt
r61309 r62632 9 9 PASS: page number of "page2" is 2 10 10 PASS: page number of "page3" is 3 11 PASS: page number of "page4" is 4 11 FAIL: expected page number of "page4" is 4. Was 3 12 12 PASS: page number of "page5" is 5 13 13 PASS: page number of "page8" is 8 … … 15 15 PASS: page number of "page9-2" is 9 16 16 PASS: page number of "page10" is 10 17 All tests passed18 17 19 18 PASS successfullyParsed is true -
trunk/WebCore/ChangeLog
r62631 r62632 1 2010-07-07 Hayato Ito <hayato@chromium.org> 2 3 Reviewed by Darin Adler. 4 5 Rolling out 'page-break-inside:avoid' part of the r54929. 6 Rebased the related layout tests, which are now expected to fail, as well. 7 8 https://bugs.webkit.org/show_bug.cgi?id=41532 9 10 * rendering/RenderBlock.cpp: 11 (WebCore::RenderBlock::paintChildren): 12 1 13 2010-07-07 Mark Rowe <mrowe@apple.com> 2 14 -
trunk/WebCore/rendering/RenderBlock.cpp
r62104 r62632 2110 2110 && (ty + child->y()) > paintInfo.rect.y() 2111 2111 && (ty + child->y()) < paintInfo.rect.bottom()) { 2112 view()->setBestTruncatedAt(ty + child->y(), this, true);2113 return;2114 }2115 2116 // Check for page-break-inside: avoid, and it it's set, break and bail.2117 bool checkInsideAvoid = !childrenInline() && ((checkPageBreaks && child->style()->pageBreakInside() == PBAVOID) || (checkColumnBreaks && child->style()->columnBreakInside() == PBAVOID));2118 if (checkInsideAvoid2119 && ty + child->y() > paintInfo.rect.y()2120 && ty + child->y() < paintInfo.rect.bottom()2121 && ty + child->y() + child->height() > paintInfo.rect.bottom()) {2122 2112 view()->setBestTruncatedAt(ty + child->y(), this, true); 2123 2113 return;
Note: See TracChangeset
for help on using the changeset viewer.