Changeset 101078 in webkit
- Timestamp:
- Nov 23, 2011 6:23:22 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r101077 r101078 1 2011-11-23 Mihnea Ovidenie <mihnea@adobe.com> 2 3 CSS Exclusions: parse the shorthand "wrap" property 4 https://bugs.webkit.org/show_bug.cgi?id=71905 5 6 Reviewed by Dean Jackson. 7 8 * fast/exclusions/script-tests/wrap-parsing.js: Added. 9 * fast/exclusions/wrap-parsing-expected.txt: Added. 10 * fast/exclusions/wrap-parsing.html: Added. 11 1 12 2011-11-23 Alexandru Chiculita <achicu@adobe.com> 2 13 -
trunk/Source/WebCore/ChangeLog
r101077 r101078 1 2011-11-23 Mihnea Ovidenie <mihnea@adobe.com> 2 3 CSS Exclusions: parse the shorthand "wrap" property 4 https://bugs.webkit.org/show_bug.cgi?id=71905 5 6 Reviewed by Dean Jackson. 7 8 Test: fast/exclusions/wrap-parsing.html 9 10 * css/CSSComputedStyleDeclaration.cpp: 11 (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): 12 * css/CSSMutableStyleDeclaration.cpp: 13 (WebCore::CSSMutableStyleDeclaration::getPropertyValue): 14 * css/CSSParser.cpp: 15 (WebCore::CSSParser::parseValue): 16 * css/CSSProperty.cpp: 17 (WebCore::CSSProperty::isInheritedProperty): 18 * css/CSSPropertyLonghand.cpp: 19 (WebCore::initShorthandMap): 20 * css/CSSPropertyNames.in: 21 * css/CSSStyleApplyProperty.cpp: 22 (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty): 23 * css/CSSStyleSelector.cpp: 24 (WebCore::CSSStyleSelector::applyProperty): 25 1 26 2011-11-23 Alexandru Chiculita <achicu@adobe.com> 2 27 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r101048 r101078 2059 2059 case CSSPropertyWebkitRegionOverflow: 2060 2060 return primitiveValueCache->createValue(style->regionOverflow()); 2061 case CSSPropertyWebkitWrapFlow: 2062 return primitiveValueCache->createValue(style->wrapFlow()); 2061 2063 case CSSPropertyWebkitWrapMargin: 2062 2064 return primitiveValueCache->createValue(style->wrapMargin()); 2063 2065 case CSSPropertyWebkitWrapPadding: 2064 2066 return primitiveValueCache->createValue(style->wrapPadding()); 2067 case CSSPropertyWebkitWrapShapeInside: 2068 if (!style->wrapShapeInside()) 2069 return primitiveValueCache->createIdentifierValue(CSSValueAuto); 2070 return primitiveValueCache->createValue(style->wrapShapeInside()); 2071 case CSSPropertyWebkitWrapShapeOutside: 2072 if (!style->wrapShapeOutside()) 2073 return primitiveValueCache->createIdentifierValue(CSSValueAuto); 2074 return primitiveValueCache->createValue(style->wrapShapeOutside()); 2075 case CSSPropertyWebkitWrapThrough: 2076 return primitiveValueCache->createValue(style->wrapThrough()); 2065 2077 #if ENABLE(CSS_FILTERS) 2066 2078 case CSSPropertyWebkitFilter: … … 2173 2185 case CSSPropertyWebkitTransformOriginZ: 2174 2186 case CSSPropertyWebkitTransition: 2175 break; 2176 2177 case CSSPropertyWebkitWrapShapeInside: 2178 if (!style->wrapShapeInside()) 2179 return primitiveValueCache->createIdentifierValue(CSSValueAuto); 2180 return primitiveValueCache->createValue(style->wrapShapeInside()); 2181 2182 case CSSPropertyWebkitWrapShapeOutside: 2183 if (!style->wrapShapeOutside()) 2184 return primitiveValueCache->createIdentifierValue(CSSValueAuto); 2185 return primitiveValueCache->createValue(style->wrapShapeOutside()); 2186 2187 case CSSPropertyWebkitWrapFlow: 2188 return primitiveValueCache->createValue(style->wrapFlow()); 2189 case CSSPropertyWebkitWrapThrough: 2190 return primitiveValueCache->createValue(style->wrapThrough()); 2187 case CSSPropertyWebkitWrap: 2188 break; 2189 2191 2190 #if ENABLE(SVG) 2192 2191 case CSSPropertyClipPath: -
trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp
r101066 r101078 248 248 CSSPropertyWebkitAnimationFillMode }; 249 249 return getLayeredShorthandValue(properties); 250 } 251 case CSSPropertyWebkitWrap: { 252 const int properties[3] = { CSSPropertyWebkitWrapFlow, CSSPropertyWebkitWrapMargin, 253 CSSPropertyWebkitWrapPadding }; 254 return getShorthandValue(properties); 250 255 } 251 256 #if ENABLE(SVG) -
trunk/Source/WebCore/css/CSSParser.cpp
r101048 r101078 2216 2216 validPrimitive = (!id && validUnit(value, FLength | FNonNeg, m_strict)); 2217 2217 break; 2218 case CSSPropertyWebkitWrap: { 2219 const int properties[] = { CSSPropertyWebkitWrapFlow, CSSPropertyWebkitWrapMargin, CSSPropertyWebkitWrapPadding }; 2220 return parseShorthand(propId, properties, WTF_ARRAY_LENGTH(properties), important); 2221 } 2218 2222 #if ENABLE(SVG) 2219 2223 default: -
trunk/Source/WebCore/css/CSSProperty.cpp
r101048 r101078 627 627 case CSSPropertyWebkitFlowFrom: 628 628 case CSSPropertyWebkitRegionOverflow: 629 case CSSPropertyWebkitWrapShapeInside:630 case CSSPropertyWebkitWrapShapeOutside:631 case CSSPropertyWebkitWrapMargin:632 case CSSPropertyWebkitWrapPadding:633 629 case CSSPropertyWebkitRegionBreakAfter: 634 630 case CSSPropertyWebkitRegionBreakBefore: 635 631 case CSSPropertyWebkitRegionBreakInside: 632 case CSSPropertyWebkitWrap: 636 633 case CSSPropertyWebkitWrapFlow: 634 case CSSPropertyWebkitWrapMargin: 635 case CSSPropertyWebkitWrapPadding: 636 case CSSPropertyWebkitWrapShapeInside: 637 case CSSPropertyWebkitWrapShapeOutside: 637 638 case CSSPropertyWebkitWrapThrough: 638 639 #if ENABLE(SVG) -
trunk/Source/WebCore/css/CSSPropertyLonghand.cpp
r100273 r101078 135 135 SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSSPropertyPadding, paddingProperties); 136 136 137 static const int webkitWrapProperties[] = { 138 CSSPropertyWebkitWrapFlow, 139 CSSPropertyWebkitWrapMargin, 140 CSSPropertyWebkitWrapPadding 141 }; 142 SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSSPropertyWebkitWrap, webkitWrapProperties); 143 137 144 static const int textStrokeProperties[] = { CSSPropertyWebkitTextStrokeColor, CSSPropertyWebkitTextStrokeWidth }; 138 145 SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSSPropertyWebkitTextStroke, textStrokeProperties); -
trunk/Source/WebCore/css/CSSPropertyNames.in
r101048 r101078 364 364 -webkit-wrap-flow 365 365 -webkit-wrap-through 366 -webkit-wrap 366 367 #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS 367 368 -webkit-tap-highlight-color -
trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp
r100656 r101078 1088 1088 setPropertyHandler(CSSPropertyWebkitWrapMargin, ApplyPropertyLength<&RenderStyle::wrapMargin, &RenderStyle::setWrapMargin, &RenderStyle::initialWrapMargin>::createHandler()); 1089 1089 setPropertyHandler(CSSPropertyWebkitWrapPadding, ApplyPropertyLength<&RenderStyle::wrapPadding, &RenderStyle::setWrapPadding, &RenderStyle::initialWrapPadding>::createHandler()); 1090 setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler()); 1091 setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler()); 1092 setPropertyHandler(CSSPropertyWebkitWrap, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitWrapFlow, CSSPropertyWebkitWrapMargin, CSSPropertyWebkitWrapPadding>::createHandler()); 1090 1093 1091 1094 setPropertyHandler(CSSPropertyZIndex, ApplyPropertyAuto<int, &RenderStyle::zIndex, &RenderStyle::setZIndex, &RenderStyle::hasAutoZIndex, &RenderStyle::setHasAutoZIndex>::createHandler()); -
trunk/Source/WebCore/css/CSSStyleSelector.cpp
r101066 r101078 3879 3879 else if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_SHAPE) 3880 3880 m_style->setWrapShapeOutside(primitiveValue->getShapeValue()); 3881 return;3882 3883 case CSSPropertyWebkitWrapFlow:3884 HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(wrapFlow, WrapFlow);3885 return;3886 3887 case CSSPropertyWebkitWrapThrough:3888 HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(wrapThrough, WrapThrough);3889 3881 return; 3890 3882 … … 4068 4060 case CSSPropertyWebkitWrapMargin: 4069 4061 case CSSPropertyWebkitWrapPadding: 4062 case CSSPropertyWebkitWrapFlow: 4063 case CSSPropertyWebkitWrapThrough: 4064 case CSSPropertyWebkitWrap: 4070 4065 case CSSPropertyZIndex: 4071 4066 ASSERT_NOT_REACHED();
Note: See TracChangeset
for help on using the changeset viewer.