Changeset 84119 in webkit


Ignore:
Timestamp:
Apr 17, 2011 7:10:04 PM (13 years ago)
Author:
mitz@apple.com
Message:

REGRESSION (r84096): <br> moved to the right in fast/block/float/032.html
​https://bugs.webkit.org/show_bug.cgi?id=58736

Reviewed by Maciej Stachowiak.

Source/WebCore:

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::appendFloatingObjectToLastLine): It is enough to extend the float so
that it touches the bottom of the previous line, since RenderBlock::markLinesDirtyInBlockRange()
always dirties the line after the last one in the range.

LayoutTests:

Revert to the correct results.

  • platform/chromium-win/fast/block/float/032-expected.txt:
  • platform/gtk/fast/block/float/032-expected.txt:
  • platform/mac/fast/block/float/032-expected.txt:
  • platform/qt/fast/block/float/032-expected.txt:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r84110 r84119  
     12011-04-17  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        REGRESSION (r84096): <br> moved to the right in fast/block/float/032.html
     6        https://bugs.webkit.org/show_bug.cgi?id=58736
     7
     8        Revert to the correct results.
     9
     10        * platform/chromium-win/fast/block/float/032-expected.txt:
     11        * platform/gtk/fast/block/float/032-expected.txt:
     12        * platform/mac/fast/block/float/032-expected.txt:
     13        * platform/qt/fast/block/float/032-expected.txt:
     14
    1152011-04-17  Gavin Peters  <gavinp@chromium.org>
    216

  • trunk/LayoutTests/platform/chromium-win/fast/block/float/032-expected.txt

    r84098 r84119  
    3636        RenderText {#text} at (0,0) size 0x0
    3737      RenderBlock (anonymous) at (0,760) size 769x20
    38         RenderBR {BR} at (105,0) size 0x19
     38        RenderBR {BR} at (0,0) size 0x19
    3939      RenderBlock {DIV} at (0,780) size 769x110 [border: (5px solid #000000)]
    4040        RenderBlock (floating) {DIV} at (5,5) size 100x100 [bgcolor=#008000]

  • trunk/LayoutTests/platform/gtk/fast/block/float/032-expected.txt

    r84098 r84119  
    3636        RenderText {#text} at (0,0) size 0x0
    3737      RenderBlock (anonymous) at (0,755) size 768x19
    38         RenderBR {BR} at (105,0) size 0x19
     38        RenderBR {BR} at (0,0) size 0x19
    3939      RenderBlock {DIV} at (0,774) size 768x110 [border: (5px solid #000000)]
    4040        RenderBlock (floating) {DIV} at (5,5) size 100x100 [bgcolor=#008000]

  • trunk/LayoutTests/platform/mac/fast/block/float/032-expected.txt

    r84098 r84119  
    3636        RenderText {#text} at (0,0) size 0x0
    3737      RenderBlock (anonymous) at (0,750) size 769x18
    38         RenderBR {BR} at (105,0) size 0x18
     38        RenderBR {BR} at (0,0) size 0x18
    3939      RenderBlock {DIV} at (0,768) size 769x110 [border: (5px solid #000000)]
    4040        RenderBlock (floating) {DIV} at (5,5) size 100x100 [bgcolor=#008000]

  • trunk/LayoutTests/platform/qt/fast/block/float/032-expected.txt

    r84098 r84119  
    3636        RenderText {#text} at (0,0) size 0x0
    3737      RenderBlock (anonymous) at (0,755) size 784x19
    38         RenderBR {BR} at (105,0) size 0x19
     38        RenderBR {BR} at (0,0) size 0x19
    3939      RenderBlock {DIV} at (0,774) size 784x110 [border: (5px solid #000000)]
    4040        RenderBlock (floating) {DIV} at (5,5) size 100x100 [bgcolor=#008000]

  • trunk/Source/WebCore/ChangeLog

    r84117 r84119  
     12011-04-17  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Maciej Stachowiak.
     4
     5        REGRESSION (r84096): <br> moved to the right in fast/block/float/032.html
     6        https://bugs.webkit.org/show_bug.cgi?id=58736
     7
     8        * rendering/RenderBlockLineLayout.cpp:
     9        (WebCore::RenderBlock::appendFloatingObjectToLastLine): It is enough to extend the float so
     10        that it touches the bottom of the previous line, since RenderBlock::markLinesDirtyInBlockRange()
     11        always dirties the line after the last one in the range.
     12
    1132011-04-17  Patrick Gansterer  <paroga@webkit.org>
    214

  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r84107 r84119  
    718718{
    719719    // Ensure that the float touches the line.
    720     if (logicalBottomForFloat(floatingObject) < lastRootBox()->blockLogicalHeight())
    721         setLogicalHeightForFloat(floatingObject, lastRootBox()->blockLogicalHeight() - logicalTopForFloat(floatingObject));
     720    if (RootInlineBox* previousLine = lastRootBox()->prevRootBox()) {
     721        if (logicalBottomForFloat(floatingObject) < previousLine->blockLogicalHeight())
     722            setLogicalHeightForFloat(floatingObject, previousLine->blockLogicalHeight() - logicalTopForFloat(floatingObject));
     723    }
    722724
    723725    lastRootBox()->appendFloat(floatingObject->renderer());
Note: See TracChangeset for help on using the changeset viewer.