Changeset 98812 in webkit


Ignore:
Timestamp:
Oct 29, 2011 12:15:51 PM (12 years ago)
Author:
robert@webkit.org
Message:

CSS 2.1 failure: block-non-replaced-width-008.htm
​https://bugs.webkit.org/show_bug.cgi?id=69278

Reviewed by Simon Fraser.

Source/WebCore:

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalWidthUsing):

Include the margins in the calculation of logical width even when the containing block's
width is zero. This is required by section '10.3.3 Block-level, non-replaced elements in
normal flow' in the CSS 2.1 spec. Tested by block-non-replaced-width-008.htm in the CSS
test suite.

LayoutTests:

  • platform/chromium-win/fast/replaced/width100percent-searchfield-expected.txt: The pixel result is preserved, but the width of the containing block in the render tree now accurately reflects the rendered size of the cells.
  • platform/chromium/test_expectations.txt:
  • platform/mac/css2.1/20110323/block-non-replaced-width-008-expected.png:
  • platform/mac/css2.1/20110323/block-non-replaced-width-008-expected.txt:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r98811 r98812  
     12011-10-03  Robert Hogan  <robert@webkit.org>
     2
     3        CSS 2.1 failure: block-non-replaced-width-008.htm
     4        https://bugs.webkit.org/show_bug.cgi?id=69278
     5
     6        Reviewed by Simon Fraser.
     7
     8        * platform/chromium-win/fast/replaced/width100percent-searchfield-expected.txt:
     9          The pixel result is preserved, but the width of the containing block in the render
     10          tree now accurately reflects the rendered size of the cells.
     11        * platform/chromium/test_expectations.txt:
     12        * platform/mac/css2.1/20110323/block-non-replaced-width-008-expected.png:
     13        * platform/mac/css2.1/20110323/block-non-replaced-width-008-expected.txt:
     14
    1152011-10-29  Adam Barth  <abarth@webkit.org>
    216

  • trunk/LayoutTests/platform/chromium-win/fast/replaced/width100percent-searchfield-expected.txt

    r90204 r98812  
    6262    RenderText {#text} at (1,0) size 53x16
    6363      text run at (1,0) width 53: "New Mail"
    64 layer at (174,35) size 35x16
    65   RenderBlock {DIV} at (0,0) size 35x16
     64layer at (174,35) size 2x16 scrollWidth 35
     65  RenderBlock {DIV} at (0,0) size 2x16
    6666    RenderText {#text} at (1,0) size 33x16
    6767      text run at (1,0) width 33: "Reply"
    68 layer at (183,35) size 54x16
    69   RenderBlock {DIV} at (0,0) size 54x16
     68layer at (183,35) size 2x16 scrollWidth 54
     69  RenderBlock {DIV} at (0,0) size 2x16
    7070    RenderText {#text} at (1,0) size 52x16
    7171      text run at (1,0) width 52: "Reply All"
    … …  
    7474    RenderText {#text} at (1,0) size 53x16
    7575      text run at (1,0) width 53: "New Mail"
    76 layer at (676,105) size 35x16
    77   RenderBlock {DIV} at (0,0) size 35x16
     76layer at (676,105) size 2x16 scrollWidth 35
     77  RenderBlock {DIV} at (0,0) size 2x16
    7878    RenderText {#text} at (1,0) size 33x16
    7979      text run at (1,0) width 33: "Reply"
    80 layer at (685,105) size 54x16
    81   RenderBlock {DIV} at (0,0) size 54x16
     80layer at (685,105) size 2x16 scrollWidth 54
     81  RenderBlock {DIV} at (0,0) size 2x16
    8282    RenderText {#text} at (1,0) size 52x16
    8383      text run at (1,0) width 52: "Reply All"

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r98768 r98812  
    33853385// These started failing with r88913.  The results are visibly wrong, and the
    33863386// checked-in pixel results for Safari (platform/mac) are wrong too.
    3387 BUGWK62754 LINUX WIN : css2.1/20110323/block-non-replaced-width-008.htm = IMAGE+TEXT
    33883387BUGWK62754 LINUX WIN : css2.1/20110323/block-replaced-width-001.htm = IMAGE+TEXT
    33893388BUGWK62754 LINUX WIN : css2.1/20110323/replaced-elements-001.htm = IMAGE+TEXT

  • trunk/LayoutTests/platform/mac/css2.1/20110323/block-non-replaced-width-008-expected.txt

    r88913 r98812  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x258
    4   RenderBlock {HTML} at (0,0) size 800x258
    5     RenderBody {BODY} at (8,16) size 784x234
    6       RenderBlock {P} at (0,0) size 784x18
    7         RenderText {#text} at (0,0) size 338x18
    8           text run at (0,0) width 338: "Test passes if there is a filled green square below and "
    9         RenderInline {STRONG} at (0,0) size 44x18
    10           RenderText {#text} at (338,0) size 44x18
    11             text run at (338,0) width 44: "no red"
    12         RenderText {#text} at (382,0) size 4x18
    13           text run at (382,0) width 4: "."
    14       RenderBlock {DIV} at (0,34) size 400x200 [border: (200px solid #FF0000) none]
    15         RenderBlock {DIV} at (0,0) size 200x200 [border: (200px solid #008000) none]
     3layer at (0,0) size 800x260
     4  RenderBlock {HTML} at (0,0) size 800x260
     5    RenderBody {BODY} at (8,16) size 784x236
     6      RenderBlock {P} at (0,0) size 784x20
     7        RenderText {#text} at (0,0) size 323x19
     8          text run at (0,0) width 323: "Test passes if there is a filled green square below and "
     9        RenderInline {STRONG} at (0,0) size 42x19
     10          RenderText {#text} at (323,0) size 42x19
     11            text run at (323,0) width 42: "no red"
     12        RenderText {#text} at (365,0) size 4x19
     13          text run at (365,0) width 4: "."
     14      RenderBlock {DIV} at (0,36) size 400x200 [border: (200px solid #FF0000) none]
     15        RenderBlock {DIV} at (0,0) size 400x200 [border: (200px solid #008000) none]

  • trunk/Source/WebCore/ChangeLog

    r98807 r98812  
     12011-10-03  Robert Hogan  <robert@webkit.org>
     2
     3        CSS 2.1 failure: block-non-replaced-width-008.htm
     4        https://bugs.webkit.org/show_bug.cgi?id=69278
     5
     6        Reviewed by Simon Fraser.
     7
     8        * rendering/RenderBox.cpp:
     9        (WebCore::RenderBox::computeLogicalWidthUsing):
     10          Include the margins in the calculation of logical width even when the containing block's
     11          width is zero. This is required by section '10.3.3 Block-level, non-replaced elements in
     12          normal flow' in the CSS 2.1 spec. Tested by block-non-replaced-width-008.htm in the CSS
     13          test suite.
     14
    1152011-10-29  Anna Cavender  <annacc@chromium.org>
    216

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

    r98400 r98812  
    17691769        LayoutUnit marginStart = style()->marginStart().calcMinValue(availableLogicalWidth);
    17701770        LayoutUnit marginEnd = style()->marginEnd().calcMinValue(availableLogicalWidth);
    1771         if (availableLogicalWidth)
    1772             logicalWidthResult = availableLogicalWidth - marginStart - marginEnd;
     1771        logicalWidthResult = availableLogicalWidth - marginStart - marginEnd;
    17731772
    17741773        if (sizesToIntrinsicLogicalWidth(widthType)) {
Note: See TracChangeset for help on using the changeset viewer.