Changeset 134433 in webkit
- Timestamp:
- Nov 13, 2012 9:53:31 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 4 deleted
- 17 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r134432 r134433 1 2012-11-13 Bem Jones-Bey <bjonesbe@adobe.com> 2 3 [CSS Exclusions] Update wrap-margin/padding to shape-margin/padding 4 https://bugs.webkit.org/show_bug.cgi?id=97736 5 6 Reviewed by Andreas Kling. 7 8 Rename properties to match updated spec. 9 10 * fast/exclusions/css-exclusions-disabled-expected.txt: 11 * fast/exclusions/css-exclusions-disabled.html: 12 * fast/exclusions/script-tests/shape-margin-parsing.js: Added. 13 (test): 14 (testComputedStyle): 15 (testNotInherited): 16 * fast/exclusions/script-tests/shape-padding-parsing.js: Added. 17 (test): 18 (testComputedStyle): 19 (testNotInherited): 20 * fast/exclusions/script-tests/wrap-margin-parsing.js: Removed. 21 * fast/exclusions/script-tests/wrap-padding-parsing.js: Removed. 22 * fast/exclusions/script-tests/wrap-parsing.js: 23 (testComputedStyle): 24 * fast/exclusions/shape-margin-parsing-expected.txt: Added. 25 * fast/exclusions/shape-margin-parsing.html: Renamed from LayoutTests/fast/exclusions/wrap-padding-parsing.html. 26 * fast/exclusions/shape-padding-parsing-expected.txt: Added. 27 * fast/exclusions/shape-padding-parsing.html: Renamed from LayoutTests/fast/exclusions/wrap-margin-parsing.html. 28 * fast/exclusions/wrap-margin-parsing-expected.txt: Removed. 29 * fast/exclusions/wrap-padding-parsing-expected.txt: Removed. 30 1 31 2012-11-13 Dimitri Glazkov <dglazkov@chromium.org> 2 32 -
trunk/LayoutTests/fast/exclusions/css-exclusions-disabled-expected.txt
r114020 r134433 6 6 PASS testInlineStyle("-webkit-wrap-flow", "both") is null 7 7 PASS testComputedStyle("-webkit-wrap-flow", "both") is "auto" 8 PASS testInlineStyle("-webkit- wrap-margin", "10px") is null9 PASS testComputedStyle("-webkit- wrap-margin", "10px") is "0px"10 PASS testInlineStyle("-webkit- wrap-padding", "10px") is null11 PASS testComputedStyle("-webkit- wrap-padding", "10px") is "0px"8 PASS testInlineStyle("-webkit-shape-margin", "10px") is null 9 PASS testComputedStyle("-webkit-shape-margin", "10px") is "0px" 10 PASS testInlineStyle("-webkit-shape-padding", "10px") is null 11 PASS testComputedStyle("-webkit-shape-padding", "10px") is "0px" 12 12 PASS testInlineStyle("-webkit-wrap-through", "none") is null 13 13 PASS testComputedStyle("-webkit-wrap-through", "none") is "wrap" -
trunk/LayoutTests/fast/exclusions/css-exclusions-disabled.html
r127241 r134433 32 32 testStyle("-webkit-wrap-flow", "both", "auto"); 33 33 34 testStyle("-webkit- wrap-margin", "10px", "0px");35 testStyle("-webkit- wrap-padding", "10px", "0px");34 testStyle("-webkit-shape-margin", "10px", "0px"); 35 testStyle("-webkit-shape-padding", "10px", "0px"); 36 36 37 37 testStyle("-webkit-wrap-through", "none", "wrap"); -
trunk/LayoutTests/fast/exclusions/script-tests/wrap-parsing.js
r127241 r134433 15 15 div.style.setProperty("-webkit-wrap", value); 16 16 var webkitWrapFlowComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-flow"); 17 var webkit WrapMarginComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-margin");18 var webkit WrapPaddingComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-padding");17 var webkitShapeMarginComputedValue = getComputedStyle(div).getPropertyValue("-webkit-shape-margin"); 18 var webkitShapePaddingComputedValue = getComputedStyle(div).getPropertyValue("-webkit-shape-padding"); 19 19 document.body.removeChild(div); 20 return webkitWrapFlowComputedValue + " " + webkit WrapMarginComputedValue + " " + webkitWrapPaddingComputedValue;20 return webkitWrapFlowComputedValue + " " + webkitShapeMarginComputedValue + " " + webkitShapePaddingComputedValue; 21 21 } 22 22 -
trunk/LayoutTests/fast/exclusions/shape-margin-parsing.html
r134432 r134433 5 5 </head> 6 6 <body> 7 <script src="script-tests/ wrap-margin-parsing.js"></script>7 <script src="script-tests/shape-margin-parsing.js"></script> 8 8 <script src="../../fast/js/resources/js-test-post.js"></script> 9 9 </body> -
trunk/LayoutTests/fast/exclusions/shape-padding-parsing.html
r134432 r134433 5 5 </head> 6 6 <body> 7 <script src="script-tests/ wrap-padding-parsing.js"></script>7 <script src="script-tests/shape-padding-parsing.js"></script> 8 8 <script src="../../fast/js/resources/js-test-post.js"></script> 9 9 </body> -
trunk/Source/WebCore/ChangeLog
r134432 r134433 1 2012-11-13 Bem Jones-Bey <bjonesbe@adobe.com> 2 3 [CSS Exclusions] Update wrap-margin/padding to shape-margin/padding 4 https://bugs.webkit.org/show_bug.cgi?id=97736 5 6 Reviewed by Andreas Kling. 7 8 Rename properties to match updated spec. 9 10 Tests: fast/exclusions/shape-margin-parsing.html 11 fast/exclusions/shape-padding-parsing.html 12 13 * css/CSSComputedStyleDeclaration.cpp: 14 (WebCore): 15 (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): 16 * css/CSSParser.cpp: 17 (WebCore::isSimpleLengthPropertyID): 18 (WebCore::CSSParser::parseValue): 19 * css/CSSProperty.cpp: 20 (WebCore::CSSProperty::isInheritedProperty): 21 * css/CSSPropertyNames.in: 22 * css/StyleBuilder.cpp: 23 (WebCore::StyleBuilder::StyleBuilder): 24 * css/StylePropertySet.cpp: 25 (WebCore::StylePropertySet::asText): 26 * css/StylePropertyShorthand.cpp: 27 (WebCore::webkitWrapShorthand): 28 * css/StyleResolver.cpp: 29 (WebCore::StyleResolver::applyProperty): 30 * rendering/style/RenderStyle.cpp: 31 (WebCore::RenderStyle::diff): 32 * rendering/style/RenderStyle.h: 33 * rendering/style/StyleRareNonInheritedData.cpp: 34 (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): 35 (WebCore::StyleRareNonInheritedData::operator==): 36 * rendering/style/StyleRareNonInheritedData.h: 37 (StyleRareNonInheritedData): 38 1 39 2012-11-13 Dimitri Glazkov <dglazkov@chromium.org> 2 40 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r134190 r134433 357 357 #if ENABLE(CSS_EXCLUSIONS) 358 358 CSSPropertyWebkitWrapFlow, 359 CSSPropertyWebkit WrapMargin,360 CSSPropertyWebkit WrapPadding,359 CSSPropertyWebkitShapeMargin, 360 CSSPropertyWebkitShapePadding, 361 361 CSSPropertyWebkitWrapThrough, 362 362 #endif … … 2499 2499 case CSSPropertyWebkitWrapFlow: 2500 2500 return cssValuePool().createValue(style->wrapFlow()); 2501 case CSSPropertyWebkit WrapMargin:2502 return cssValuePool().createValue(style-> wrapMargin());2503 case CSSPropertyWebkit WrapPadding:2504 return cssValuePool().createValue(style-> wrapPadding());2501 case CSSPropertyWebkitShapeMargin: 2502 return cssValuePool().createValue(style->shapeMargin()); 2503 case CSSPropertyWebkitShapePadding: 2504 return cssValuePool().createValue(style->shapePadding()); 2505 2505 case CSSPropertyWebkitShapeInside: 2506 2506 if (!style->shapeInside()) -
trunk/Source/WebCore/css/CSSParser.cpp
r134190 r134433 506 506 return true; 507 507 #if ENABLE(CSS_EXCLUSIONS) 508 case CSSPropertyWebkit WrapMargin:509 case CSSPropertyWebkit WrapPadding:508 case CSSPropertyWebkitShapeMargin: 509 case CSSPropertyWebkitShapePadding: 510 510 acceptsNegativeNumbers = false; 511 511 return RuntimeEnabledFeatures::cssExclusionsEnabled(); … … 2741 2741 return parseBasicShape(propId, important); 2742 2742 break; 2743 case CSSPropertyWebkit WrapMargin:2744 case CSSPropertyWebkit WrapPadding:2743 case CSSPropertyWebkitShapeMargin: 2744 case CSSPropertyWebkitShapePadding: 2745 2745 validPrimitive = (RuntimeEnabledFeatures::cssExclusionsEnabled() && !id && validUnit(value, FLength | FNonNeg)); 2746 2746 break; -
trunk/Source/WebCore/css/CSSProperty.cpp
r134190 r134433 653 653 case CSSPropertyWebkitWrap: 654 654 case CSSPropertyWebkitWrapFlow: 655 case CSSPropertyWebkit WrapMargin:656 case CSSPropertyWebkit WrapPadding:655 case CSSPropertyWebkitShapeMargin: 656 case CSSPropertyWebkitShapePadding: 657 657 case CSSPropertyWebkitShapeInside: 658 658 case CSSPropertyWebkitShapeOutside: -
trunk/Source/WebCore/css/CSSPropertyNames.in
r134190 r134433 398 398 -webkit-shape-inside 399 399 -webkit-shape-outside 400 -webkit- wrap-margin401 -webkit- wrap-padding400 -webkit-shape-margin 401 -webkit-shape-padding 402 402 -webkit-wrap-flow 403 403 -webkit-wrap-through -
trunk/Source/WebCore/css/StyleBuilder.cpp
r134190 r134433 2068 2068 2069 2069 #if ENABLE(CSS_EXCLUSIONS) 2070 setPropertyHandler(CSSPropertyWebkitWrap, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitWrapFlow, CSSPropertyWebkit WrapMargin, CSSPropertyWebkitWrapPadding>::createHandler());2070 setPropertyHandler(CSSPropertyWebkitWrap, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitWrapFlow, CSSPropertyWebkitShapeMargin, CSSPropertyWebkitShapePadding>::createHandler()); 2071 2071 setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler()); 2072 setPropertyHandler(CSSPropertyWebkit WrapMargin, ApplyPropertyLength<&RenderStyle::wrapMargin, &RenderStyle::setWrapMargin, &RenderStyle::initialWrapMargin>::createHandler());2073 setPropertyHandler(CSSPropertyWebkit WrapPadding, ApplyPropertyLength<&RenderStyle::wrapPadding, &RenderStyle::setWrapPadding, &RenderStyle::initialWrapPadding>::createHandler());2072 setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler()); 2073 setPropertyHandler(CSSPropertyWebkitShapePadding, ApplyPropertyLength<&RenderStyle::shapePadding, &RenderStyle::setShapePadding, &RenderStyle::initialShapePadding>::createHandler()); 2074 2074 setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler()); 2075 2075 setPropertyHandler(CSSPropertyWebkitShapeInside, ApplyPropertyExclusionShape<&RenderStyle::shapeInside, &RenderStyle::setShapeInside, &RenderStyle::initialShapeInside>::createHandler()); -
trunk/Source/WebCore/css/StylePropertySet.cpp
r134190 r134433 814 814 #if ENABLE(CSS_EXCLUSIONS) 815 815 case CSSPropertyWebkitWrapFlow: 816 case CSSPropertyWebkit WrapMargin:817 case CSSPropertyWebkit WrapPadding:816 case CSSPropertyWebkitShapeMargin: 817 case CSSPropertyWebkitShapePadding: 818 818 shorthandPropertyID = CSSPropertyWebkitWrap; 819 819 break; -
trunk/Source/WebCore/css/StylePropertyShorthand.cpp
r127318 r134433 442 442 static const CSSPropertyID webkitWrapProperties[] = { 443 443 CSSPropertyWebkitWrapFlow, 444 CSSPropertyWebkit WrapMargin,445 CSSPropertyWebkit WrapPadding444 CSSPropertyWebkitShapeMargin, 445 CSSPropertyWebkitShapePadding 446 446 }; 447 447 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitWrapLonghands, (webkitWrapProperties, WTF_ARRAY_LENGTH(webkitWrapProperties))); -
trunk/Source/WebCore/css/StyleResolver.cpp
r134425 r134433 3878 3878 case CSSPropertyWebkitWrap: 3879 3879 case CSSPropertyWebkitWrapFlow: 3880 case CSSPropertyWebkit WrapMargin:3881 case CSSPropertyWebkit WrapPadding:3880 case CSSPropertyWebkitShapeMargin: 3881 case CSSPropertyWebkitShapePadding: 3882 3882 case CSSPropertyWebkitWrapThrough: 3883 3883 case CSSPropertyWebkitShapeInside: -
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
r134242 r134433 398 398 if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_wrapFlow 399 399 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedData->m_wrapThrough 400 || rareNonInheritedData->m_ wrapMargin != other->rareNonInheritedData->m_wrapMargin401 || rareNonInheritedData->m_ wrapPadding != other->rareNonInheritedData->m_wrapPadding)400 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedData->m_shapeMargin 401 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedData->m_shapePadding) 402 402 return StyleDifferenceLayout; 403 403 -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r134242 r134433 1482 1482 static ClipPathOperation* initialClipPath() { return 0; } 1483 1483 1484 Length wrapPadding() const { return rareNonInheritedData->m_wrapPadding; }1485 void set WrapPadding(Length wrapPadding) { SET_VAR(rareNonInheritedData, m_wrapPadding, wrapPadding); }1486 static Length initial WrapPadding() { return Length(0, Fixed); }1487 1488 Length wrapMargin() const { return rareNonInheritedData->m_wrapMargin; }1489 void set WrapMargin(Length wrapMargin) { SET_VAR(rareNonInheritedData, m_wrapMargin, wrapMargin); }1490 static Length initial WrapMargin() { return Length(0, Fixed); }1484 Length shapePadding() const { return rareNonInheritedData->m_shapePadding; } 1485 void setShapePadding(Length shapePadding) { SET_VAR(rareNonInheritedData, m_shapePadding, shapePadding); } 1486 static Length initialShapePadding() { return Length(0, Fixed); } 1487 1488 Length shapeMargin() const { return rareNonInheritedData->m_shapeMargin; } 1489 void setShapeMargin(Length shapeMargin) { SET_VAR(rareNonInheritedData, m_shapeMargin, shapeMargin); } 1490 static Length initialShapeMargin() { return Length(0, Fixed); } 1491 1491 1492 1492 bool hasContent() const { return contentData(); } -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
r134242 r134433 52 52 , m_shapeInside(RenderStyle::initialShapeInside()) 53 53 , m_shapeOutside(RenderStyle::initialShapeOutside()) 54 , m_ wrapMargin(RenderStyle::initialWrapMargin())55 , m_ wrapPadding(RenderStyle::initialWrapPadding())54 , m_shapeMargin(RenderStyle::initialShapeMargin()) 55 , m_shapePadding(RenderStyle::initialShapePadding()) 56 56 , m_clipPath(RenderStyle::initialClipPath()) 57 57 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) … … 126 126 , m_shapeInside(o.m_shapeInside) 127 127 , m_shapeOutside(o.m_shapeOutside) 128 , m_ wrapMargin(o.m_wrapMargin)129 , m_ wrapPadding(o.m_wrapPadding)128 , m_shapeMargin(o.m_shapeMargin) 129 , m_shapePadding(o.m_shapePadding) 130 130 , m_clipPath(o.m_clipPath) 131 131 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) … … 211 211 && m_shapeInside == o.m_shapeInside 212 212 && m_shapeOutside == o.m_shapeOutside 213 && m_ wrapMargin == o.m_wrapMargin214 && m_ wrapPadding == o.m_wrapPadding213 && m_shapeMargin == o.m_shapeMargin 214 && m_shapePadding == o.m_shapePadding 215 215 && m_clipPath == o.m_clipPath 216 216 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
r134242 r134433 140 140 RefPtr<BasicShape> m_shapeInside; 141 141 RefPtr<BasicShape> m_shapeOutside; 142 Length m_ wrapMargin;143 Length m_ wrapPadding;142 Length m_shapeMargin; 143 Length m_shapePadding; 144 144 145 145 RefPtr<ClipPathOperation> m_clipPath;
Note: See TracChangeset
for help on using the changeset viewer.