Changeset 172757 in webkit


Ignore:
Timestamp:
Aug 19, 2014 1:41:08 PM (10 years ago)
Author:
Bem Jones-Bey
Message:

[CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
https://bugs.webkit.org/show_bug.cgi?id=135926

Reviewed by Dirk Schulze.

Source/WebCore:

shape-image-threshold is a Number, so it should be parsed as one. The
default parsing doesn't support calcs, but numbers do.

No new tests, fixes exitsing test to pass.

  • css/DeprecatedStyleBuilder.cpp:

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Use

ApplyPropertyNumber instead of ApplyPropertyDefault for
shape-image-threshold.

LayoutTests:

  • TestExpectations: Remove Failure and Crash expectations.
  • css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt:

Proper expected results now that the test passes.

  • css3/shapes/shape-outside/values/shape-image-threshold-001.html:

Adding together calcs isn't valid, so move the addition inside of
the calc expression. This will also be updated upstream.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r172753 r172757  
     12014-08-19  Bem Jones-Bey  <bjonesbe@adobe.com>
     2
     3        [CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
     4        https://bugs.webkit.org/show_bug.cgi?id=135926
     5
     6        Reviewed by Dirk Schulze.
     7
     8        * TestExpectations: Remove Failure and Crash expectations.
     9        * css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt:
     10            Proper expected results now that the test passes.
     11        * css3/shapes/shape-outside/values/shape-image-threshold-001.html:
     12            Adding together calcs isn't valid, so move the addition inside of
     13            the calc expression. This will also be updated upstream.
     14
    1152014-08-19  Alexey Proskuryakov  <ap@apple.com>
    216
  • trunk/LayoutTests/TestExpectations

    r172753 r172757  
    155155webkit.org/b/135925 css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html [ ImageOnlyFailure ]
    156156
    157 webkit.org/b/135926 css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Failure ]
    158 
    159157webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-010.html [ ImageOnlyFailure ]
    160158webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-011.html [ ImageOnlyFailure ]
     
    167165webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-018.html [ ImageOnlyFailure ]
    168166webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-019.html [ ImageOnlyFailure ]
    169 
    170 [ Debug ] css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Crash ]
    171 
    172 webkit.org/b/136075 [ Debug ] css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Skip ]
  • trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001-expected.txt

    r172733 r172757  
    1 PASS
     1
     2PASS calc(10/100) - inline
     3PASS calc(10/100 + 30/100) - inline
     4PASS calc(150/100) - inline
     5PASS calc(150/100 - 2) - inline
     6PASS calc(10/100) - computed
     7PASS calc(10/100 + 30/100) - computed
     8PASS calc(150/100) - computed
     9PASS calc(150/100 - 2) - computed
     10
  • trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html

    r172733 r172757  
    2323            },
    2424            {
    25               "actual": "calc(10/100) + calc(30/100)",
    26               "expected_inline": "calc(0.1) + calc(0.3)",
     25              "actual": "calc(10/100 + 30/100)",
     26              "expected_inline": "calc(0.4)",
    2727              "expected_computed": "0.4"
    2828            },
  • trunk/Source/WebCore/ChangeLog

    r172749 r172757  
     12014-08-19  Bem Jones-Bey  <bjonesbe@adobe.com>
     2
     3        [CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
     4        https://bugs.webkit.org/show_bug.cgi?id=135926
     5
     6        Reviewed by Dirk Schulze.
     7
     8        shape-image-threshold is a Number, so it should be parsed as one. The
     9        default parsing doesn't support calcs, but numbers do.
     10
     11        No new tests, fixes exitsing test to pass.
     12
     13        * css/DeprecatedStyleBuilder.cpp:
     14        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Use
     15            ApplyPropertyNumber instead of ApplyPropertyDefault for
     16            shape-image-threshold.
     17
    1182014-08-18  Maciej Stachowiak  <mjs@apple.com>
    219
  • trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

    r172711 r172757  
    25832583#if ENABLE(CSS_SHAPES)
    25842584    setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
    2585     setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyDefault<float, &RenderStyle::shapeImageThreshold, float, &RenderStyle::setShapeImageThreshold, float, &RenderStyle::initialShapeImageThreshold>::createHandler());
     2585    setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyNumber<float, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold, &RenderStyle::initialShapeImageThreshold>::createHandler());
    25862586    setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler());
    25872587#endif
Note: See TracChangeset for help on using the changeset viewer.