Skip to content
Permalink
Browse files
2010-07-07 Hayato Ito <hayato@chromium.org>
        Reviewed by Darin Adler.

        Rolling out 'page-break-inside:avoid' part of the r54929.
        Rebased the related layout tests, which are now expected to fail, as well.

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

        * fast/multicol/break-properties-expected.txt:
        * printing/page-break-inside-avoid-expected.txt:
2010-07-07  Hayato Ito  <hayato@chromium.org>

        Reviewed by Darin Adler.

        Rolling out 'page-break-inside:avoid' part of the r54929.
        Rebased the related layout tests, which are now expected to fail, as well.

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

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

Canonical link: https://commits.webkit.org/53547@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@62632 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Jul 7, 2010
1 parent 4219ae1 commit d8279578387e8968dbe66548a13ec80f72c2aef4
Showing 5 changed files with 26 additions and 13 deletions.
@@ -1,3 +1,15 @@
2010-07-07 Hayato Ito <hayato@chromium.org>

Reviewed by Darin Adler.

Rolling out 'page-break-inside:avoid' part of the r54929.
Rebased the related layout tests, which are now expected to fail, as well.

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

* fast/multicol/break-properties-expected.txt:
* printing/page-break-inside-avoid-expected.txt:

2010-07-06 Pavel Feldman <pfeldman@chromium.org>

Reviewed by Joseph Pecoraro.
@@ -1,4 +1,4 @@
PASS: 'break-before' is at (218, 8)
PASS: 'after-break' is at (428, 8)
PASS: 'no-break' is at (533, 8)
FAIL: 'no-break' is at (428, 68) instead of (533 ,8)

@@ -8,13 +8,12 @@ PASS: page number of "page1-1" is 1
PASS: page number of "page1-2" is 1
PASS: page number of "page2" is 2
PASS: page number of "page3" is 3
PASS: page number of "page4" is 4
FAIL: expected page number of "page4" is 4. Was 3
PASS: page number of "page5" is 5
PASS: page number of "page8" is 8
PASS: page number of "page9-1" is 9
PASS: page number of "page9-2" is 9
PASS: page number of "page10" is 10
All tests passed

PASS successfullyParsed is true

@@ -1,3 +1,15 @@
2010-07-07 Hayato Ito <hayato@chromium.org>

Reviewed by Darin Adler.

Rolling out 'page-break-inside:avoid' part of the r54929.
Rebased the related layout tests, which are now expected to fail, as well.

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

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

2010-07-07 Mark Rowe <mrowe@apple.com>

Fix failures in a handful of Java-related tests.
@@ -2113,16 +2113,6 @@ void RenderBlock::paintChildren(PaintInfo& paintInfo, int tx, int ty)
return;
}

// Check for page-break-inside: avoid, and it it's set, break and bail.
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()
&& ty + child->y() + child->height() > paintInfo.rect.bottom()) {
view()->setBestTruncatedAt(ty + child->y(), this, true);
return;
}

if (!child->hasSelfPaintingLayer() && !child->isFloating())
child->paint(info, tx, ty);

0 comments on commit d827957

Please sign in to comment.