Changeset 62632 in webkit


Ignore:
Timestamp:
Jul 7, 2010 1:06:21 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

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):
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r62630 r62632  
     12010-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
    1132010-07-06  Pavel Feldman  <pfeldman@chromium.org>
    214
  • trunk/LayoutTests/fast/multicol/break-properties-expected.txt

    r61065 r62632  
    11PASS: 'break-before' is at (218, 8)
    22PASS: 'after-break' is at (428, 8)
    3 PASS: 'no-break' is at (533, 8)
     3FAIL: 'no-break' is at (428, 68) instead of (533 ,8)
    44
  • trunk/LayoutTests/printing/page-break-inside-avoid-expected.txt

    r61309 r62632  
    99PASS: page number of "page2" is 2
    1010PASS: page number of "page3" is 3
    11 PASS: page number of "page4" is 4
     11FAIL: expected page number of "page4" is 4. Was 3
    1212PASS: page number of "page5" is 5
    1313PASS: page number of "page8" is 8
     
    1515PASS: page number of "page9-2" is 9
    1616PASS: page number of "page10" is 10
    17 All tests passed
    1817
    1918PASS successfullyParsed is true
  • trunk/WebCore/ChangeLog

    r62631 r62632  
     12010-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
    1132010-07-07  Mark Rowe  <mrowe@apple.com>
    214
  • trunk/WebCore/rendering/RenderBlock.cpp

    r62104 r62632  
    21102110            && (ty + child->y()) > paintInfo.rect.y()
    21112111            && (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 (checkInsideAvoid
    2119             && ty + child->y() > paintInfo.rect.y()
    2120             && ty + child->y() < paintInfo.rect.bottom()
    2121             && ty + child->y() + child->height() > paintInfo.rect.bottom()) {
    21222112            view()->setBestTruncatedAt(ty + child->y(), this, true);
    21232113            return;
Note: See TracChangeset for help on using the changeset viewer.