Changeset 111883 in webkit


Ignore:
Timestamp:
Mar 23, 2012 11:30:01 AM (12 years ago)
Author:
mikelawther@chromium.org
Message:

CSS3 calc: image sizing works with mixed percentage/absolute
https://bugs.webkit.org/show_bug.cgi?id=82017

Reviewed by Ojan Vafai.

Source/WebCore:

Test: css3/calc/img-size-expected.html

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::computeReplacedLogicalWidthUsing):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):

LayoutTests:

Test is now expected to match.

  • css3/calc/img-size-expected.html: Renamed from LayoutTests/css3/calc/img-size-expected-mismatch.html.
Location:
trunk
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r111882 r111883  
     12012-03-23  Mike Lawther  <mikelawther@chromium.org>
     2
     3        CSS3 calc: image sizing works with mixed percentage/absolute
     4        https://bugs.webkit.org/show_bug.cgi?id=82017
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Test is now expected to match.
     9
     10        * css3/calc/img-size-expected.html: Renamed from LayoutTests/css3/calc/img-size-expected-mismatch.html.
     11
    1122012-03-23  Julien Chaffraix  <jchaffraix@webkit.org>
    213
  • trunk/Source/WebCore/ChangeLog

    r111882 r111883  
     12012-03-23  Mike Lawther  <mikelawther@chromium.org>
     2
     3        CSS3 calc: image sizing works with mixed percentage/absolute
     4        https://bugs.webkit.org/show_bug.cgi?id=82017
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Test: css3/calc/img-size-expected.html
     9
     10        * rendering/RenderBox.cpp:
     11        (WebCore::RenderBox::computeReplacedLogicalWidthUsing):
     12        (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
     13
    1142012-03-23  Julien Chaffraix  <jchaffraix@webkit.org>
    215
  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r111279 r111883  
    22752275        case Fixed:
    22762276            return computeContentBoxLogicalWidth(logicalWidth.value());
    2277         case Percent: {
     2277        case Percent:
     2278        case Calculated: {
    22782279            // FIXME: containingBlockLogicalWidthForContent() is wrong if the replaced element's block-flow is perpendicular to the
    22792280            // containing block's block-flow.
     
    23072308            return computeContentBoxLogicalHeight(logicalHeight.value());
    23082309        case Percent:
     2310        case Calculated:
    23092311        {
    23102312            RenderObject* cb = isPositioned() ? container() : containingBlock();
Note: See TracChangeset for help on using the changeset viewer.