Changeset 172757 in webkit
- Timestamp:
- Aug 19, 2014 1:41:08 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r172753 r172757 1 2014-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 1 15 2014-08-19 Alexey Proskuryakov <ap@apple.com> 2 16 -
trunk/LayoutTests/TestExpectations
r172753 r172757 155 155 webkit.org/b/135925 css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html [ ImageOnlyFailure ] 156 156 157 webkit.org/b/135926 css3/shapes/shape-outside/values/shape-image-threshold-001.html [ Failure ]158 159 157 webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-010.html [ ImageOnlyFailure ] 160 158 webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-011.html [ ImageOnlyFailure ] … … 167 165 webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-018.html [ ImageOnlyFailure ] 168 166 webkit.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 2 PASS calc(10/100) - inline 3 PASS calc(10/100 + 30/100) - inline 4 PASS calc(150/100) - inline 5 PASS calc(150/100 - 2) - inline 6 PASS calc(10/100) - computed 7 PASS calc(10/100 + 30/100) - computed 8 PASS calc(150/100) - computed 9 PASS calc(150/100 - 2) - computed 10 -
trunk/LayoutTests/css3/shapes/shape-outside/values/shape-image-threshold-001.html
r172733 r172757 23 23 }, 24 24 { 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)", 27 27 "expected_computed": "0.4" 28 28 }, -
trunk/Source/WebCore/ChangeLog
r172749 r172757 1 2014-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 1 18 2014-08-18 Maciej Stachowiak <mjs@apple.com> 2 19 -
trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp
r172711 r172757 2583 2583 #if ENABLE(CSS_SHAPES) 2584 2584 setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler()); 2585 setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyProperty Default<float, &RenderStyle::shapeImageThreshold, float, &RenderStyle::setShapeImageThreshold, float, &RenderStyle::initialShapeImageThreshold>::createHandler());2585 setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyNumber<float, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold, &RenderStyle::initialShapeImageThreshold>::createHandler()); 2586 2586 setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler()); 2587 2587 #endif
Note: See TracChangeset
for help on using the changeset viewer.