Changeset 121697 in webkit


Ignore:
Timestamp:
Jul 2, 2012, 12:11:31 PM (13 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/11787030> In vertical writing modes, child following float-clearing block has incorrect logical top
​https://bugs.webkit.org/show_bug.cgi?id=90359

Reviewed by Anders Carlsson.

Source/WebCore:

Test: fast/writing-mode/logical-height-after-clear.html

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::clearFloatsIfNeeded): Changed to use logicalTop() and logicalHeight()
instead of y() and height().

LayoutTests:

  • fast/writing-mode/logical-height-after-clear-expected.html: Added.
  • fast/writing-mode/logical-height-after-clear.html: Added.
  • platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.png:
  • platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt:
  • platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.png:
  • platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt:
Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r121694 r121697  
     12012-07-02  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/11787030> In vertical writing modes, child following float-clearing block has incorrect logical top
     4        https://bugs.webkit.org/show_bug.cgi?id=90359
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * fast/writing-mode/logical-height-after-clear-expected.html: Added.
     9        * fast/writing-mode/logical-height-after-clear.html: Added.
     10        * platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.png:
     11        * platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt:
     12        * platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.png:
     13        * platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt:
     14
    1152012-07-02  Zan Dobersek  <zandobersek@gmail.com>
    216

  • trunk/LayoutTests/platform/mac/fast/multicol/vertical-lr/float-avoidance-expected.txt

    r96620 r121697  
    1 layer at (0,0) size 827x585
    2   RenderView at (0,0) size 800x585
    3 layer at (0,0) size 827x585
    4   RenderBlock {HTML} at (0,0) size 827x585
    5     RenderBody {BODY} at (8,8) size 811x569
     1layer at (0,0) size 800x600
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
    66      RenderBlock (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
    77layer at (108,8) size 142x435

  • trunk/LayoutTests/platform/mac/fast/multicol/vertical-rl/float-avoidance-expected.txt

    r96620 r121697  
    1 layer at (0,0) size 827x585
    2   RenderView at (0,0) size 800x585
    3 layer at (-27,0) size 827x585 backgroundClip at (0,0) size 827x585 clip at (0,0) size 827x585 outlineClip at (0,0) size 827x585
    4   RenderBlock {HTML} at (0,0) size 827x585
    5     RenderBody {BODY} at (8,8) size 811x569
     1layer at (0,0) size 800x600
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x600
     4  RenderBlock {HTML} at (0,0) size 800x600
     5    RenderBody {BODY} at (8,8) size 784x584
    66      RenderBlock (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
    77layer at (550,8) size 142x435

  • trunk/Source/WebCore/ChangeLog

    r121692 r121697  
     12012-07-02  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/11787030> In vertical writing modes, child following float-clearing block has incorrect logical top
     4        https://bugs.webkit.org/show_bug.cgi?id=90359
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Test: fast/writing-mode/logical-height-after-clear.html
     9
     10        * rendering/RenderBlock.cpp:
     11        (WebCore::RenderBlock::clearFloatsIfNeeded): Changed to use logicalTop() and logicalHeight()
     12        instead of y() and height().
     13
    1142012-07-02  Arko Saha  <arko@motorola.com>
    215

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

    r121557 r121697  
    20722072        // Adjust our height such that we are ready to be collapsed with subsequent siblings (or the bottom
    20732073        // of the parent block).
    2074         setLogicalHeight(child->y() - max(ZERO_LAYOUT_UNIT, marginInfo.margin()));
     2074        setLogicalHeight(child->logicalTop() - max(ZERO_LAYOUT_UNIT, marginInfo.margin()));
    20752075    } else
    20762076        // Increase our height by the amount we had to clear.
    2077         setLogicalHeight(height() + heightIncrease);
     2077        setLogicalHeight(logicalHeight() + heightIncrease);
    20782078   
    20792079    if (marginInfo.canCollapseWithMarginBefore()) {
Note: See TracChangeset for help on using the changeset viewer.