diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-25 19:20:41 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:30:55 +0000 |
commit | 6882a04fb36642862b11efe514251d32070c3d65 (patch) | |
tree | b7959826000b061fd5ccc7512035c7478742f7b0 /Source/WebCore/css/CSSProperty.cpp | |
parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
download | qtwebkit-6882a04fb36642862b11efe514251d32070c3d65.tar.gz |
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/css/CSSProperty.cpp')
-rw-r--r-- | Source/WebCore/css/CSSProperty.cpp | 605 |
1 files changed, 36 insertions, 569 deletions
diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index 13a4d7e7f..5c71d5c45 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -1,6 +1,6 @@ /** * (C) 1999-2003 Lars Knoll (knoll@kde.org) - * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. + * Copyright (C) 2004, 2005, 2006 Apple Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,10 +25,7 @@ #include "RenderStyleConstants.h" #include "StylePropertyShorthand.h" -#if ENABLE(CSS_VARIABLES) -#include "CSSVariableValue.h" -#endif - +#include <wtf/NeverDestroyed.h> #include <wtf/text/StringBuilder.h> namespace WebCore { @@ -40,119 +37,26 @@ struct SameSizeAsCSSProperty { COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small); -void CSSProperty::wrapValueInCommaSeparatedList() +CSSPropertyID StylePropertyMetadata::shorthandID() const { - RefPtr<CSSValue> value = m_value.release(); - m_value = CSSValueList::createCommaSeparated(); - static_cast<CSSValueList*>(m_value.get())->append(value.release()); + if (!m_isSetFromShorthand) + return CSSPropertyInvalid; + + Vector<StylePropertyShorthand> shorthands = matchingShorthandsForLonghand(static_cast<CSSPropertyID>(m_propertyID)); + ASSERT(shorthands.size() && m_indexInShorthandsVector >= 0 && m_indexInShorthandsVector < shorthands.size()); + return shorthands[m_indexInShorthandsVector].id(); } -enum LogicalBoxSide { BeforeSide, EndSide, AfterSide, StartSide }; -enum PhysicalBoxSide { TopSide, RightSide, BottomSide, LeftSide }; +void CSSProperty::wrapValueInCommaSeparatedList() +{ + auto list = CSSValueList::createCommaSeparated(); + list.get().append(m_value.releaseNonNull()); + m_value = WTFMove(list); +} static CSSPropertyID resolveToPhysicalProperty(TextDirection direction, WritingMode writingMode, LogicalBoxSide logicalSide, const StylePropertyShorthand& shorthand) { - if (direction == LTR) { - if (writingMode == TopToBottomWritingMode) { - // The common case. The logical and physical box sides match. - // Left = Start, Right = End, Before = Top, After = Bottom - return shorthand.properties()[logicalSide]; - } - - if (writingMode == BottomToTopWritingMode) { - // Start = Left, End = Right, Before = Bottom, After = Top. - switch (logicalSide) { - case StartSide: - return shorthand.properties()[LeftSide]; - case EndSide: - return shorthand.properties()[RightSide]; - case BeforeSide: - return shorthand.properties()[BottomSide]; - default: - return shorthand.properties()[TopSide]; - } - } - - if (writingMode == LeftToRightWritingMode) { - // Start = Top, End = Bottom, Before = Left, After = Right. - switch (logicalSide) { - case StartSide: - return shorthand.properties()[TopSide]; - case EndSide: - return shorthand.properties()[BottomSide]; - case BeforeSide: - return shorthand.properties()[LeftSide]; - default: - return shorthand.properties()[RightSide]; - } - } - - // Start = Top, End = Bottom, Before = Right, After = Left - switch (logicalSide) { - case StartSide: - return shorthand.properties()[TopSide]; - case EndSide: - return shorthand.properties()[BottomSide]; - case BeforeSide: - return shorthand.properties()[RightSide]; - default: - return shorthand.properties()[LeftSide]; - } - } - - if (writingMode == TopToBottomWritingMode) { - // Start = Right, End = Left, Before = Top, After = Bottom - switch (logicalSide) { - case StartSide: - return shorthand.properties()[RightSide]; - case EndSide: - return shorthand.properties()[LeftSide]; - case BeforeSide: - return shorthand.properties()[TopSide]; - default: - return shorthand.properties()[BottomSide]; - } - } - - if (writingMode == BottomToTopWritingMode) { - // Start = Right, End = Left, Before = Bottom, After = Top - switch (logicalSide) { - case StartSide: - return shorthand.properties()[RightSide]; - case EndSide: - return shorthand.properties()[LeftSide]; - case BeforeSide: - return shorthand.properties()[BottomSide]; - default: - return shorthand.properties()[TopSide]; - } - } - - if (writingMode == LeftToRightWritingMode) { - // Start = Bottom, End = Top, Before = Left, After = Right - switch (logicalSide) { - case StartSide: - return shorthand.properties()[BottomSide]; - case EndSide: - return shorthand.properties()[TopSide]; - case BeforeSide: - return shorthand.properties()[LeftSide]; - default: - return shorthand.properties()[RightSide]; - } - } - - // Start = Bottom, End = Top, Before = Right, After = Left - switch (logicalSide) { - case StartSide: - return shorthand.properties()[BottomSide]; - case EndSide: - return shorthand.properties()[TopSide]; - case BeforeSide: - return shorthand.properties()[RightSide]; - default: - return shorthand.properties()[LeftSide]; - } + return shorthand.properties()[mapLogicalSideToPhysicalSide(makeTextFlow(writingMode, direction), logicalSide)]; } enum LogicalExtent { LogicalWidth, LogicalHeight }; @@ -167,7 +71,7 @@ static CSSPropertyID resolveToPhysicalProperty(WritingMode writingMode, LogicalE static const StylePropertyShorthand& borderDirections() { static const CSSPropertyID properties[4] = { CSSPropertyBorderTop, CSSPropertyBorderRight, CSSPropertyBorderBottom, CSSPropertyBorderLeft }; - DEFINE_STATIC_LOCAL(StylePropertyShorthand, borderDirections, (properties, WTF_ARRAY_LENGTH(properties))); + static NeverDestroyed<StylePropertyShorthand> borderDirections(CSSPropertyBorder, properties); return borderDirections; } @@ -251,476 +155,39 @@ CSSPropertyID CSSProperty::resolveDirectionAwareProperty(CSSPropertyID propertyI } } -bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) +bool CSSProperty::isDirectionAwareProperty(CSSPropertyID propertyID) { switch (propertyID) { - case CSSPropertyBorderCollapse: - case CSSPropertyBorderSpacing: - case CSSPropertyCaptionSide: - case CSSPropertyColor: - case CSSPropertyCursor: - case CSSPropertyDirection: - case CSSPropertyEmptyCells: - case CSSPropertyFont: - case CSSPropertyFontFamily: - case CSSPropertyFontSize: - case CSSPropertyFontStyle: - case CSSPropertyFontVariant: - case CSSPropertyFontWeight: -#if ENABLE(CSS_IMAGE_ORIENTATION) - case CSSPropertyImageOrientation: -#endif - case CSSPropertyImageRendering: -#if ENABLE(CSS_IMAGE_RESOLUTION) - case CSSPropertyImageResolution: -#endif - case CSSPropertyLetterSpacing: - case CSSPropertyLineHeight: - case CSSPropertyListStyle: - case CSSPropertyListStyleImage: - case CSSPropertyListStyleType: - case CSSPropertyListStylePosition: - case CSSPropertyOrphans: - case CSSPropertyPointerEvents: - case CSSPropertyQuotes: - case CSSPropertyResize: - case CSSPropertySpeak: - case CSSPropertyTabSize: - case CSSPropertyTextAlign: - case CSSPropertyTextDecoration: - case CSSPropertyTextIndent: - case CSSPropertyTextRendering: - case CSSPropertyTextShadow: - case CSSPropertyTextTransform: -#if ENABLE(CSS_VARIABLES) - case CSSPropertyVariable: -#endif - case CSSPropertyVisibility: - case CSSPropertyWebkitAspectRatio: - case CSSPropertyWebkitBorderHorizontalSpacing: - case CSSPropertyWebkitBorderVerticalSpacing: - case CSSPropertyWebkitBoxDirection: - case CSSPropertyWebkitColorCorrection: -#if ENABLE(CURSOR_VISIBILITY) - case CSSPropertyWebkitCursorVisibility: -#endif - case CSSPropertyWebkitFontFeatureSettings: - case CSSPropertyWebkitFontKerning: - case CSSPropertyWebkitFontSmoothing: - case CSSPropertyWebkitFontVariantLigatures: - case CSSPropertyWebkitLocale: - case CSSPropertyWebkitHighlight: - case CSSPropertyWebkitHyphenateCharacter: - case CSSPropertyWebkitHyphenateLimitAfter: - case CSSPropertyWebkitHyphenateLimitBefore: - case CSSPropertyWebkitHyphenateLimitLines: - case CSSPropertyWebkitHyphens: - case CSSPropertyWebkitLineAlign: - case CSSPropertyWebkitLineBoxContain: - case CSSPropertyWebkitLineBreak: - case CSSPropertyWebkitLineGrid: - case CSSPropertyWebkitLineSnap: - case CSSPropertyWebkitNbspMode: -#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) - case CSSPropertyWebkitOverflowScrolling: -#endif - case CSSPropertyWebkitPrintColorAdjust: - case CSSPropertyWebkitRtlOrdering: - case CSSPropertyWebkitRubyPosition: - case CSSPropertyWebkitTextCombine: -#if ENABLE(CSS3_TEXT) - case CSSPropertyWebkitTextDecorationLine: - case CSSPropertyWebkitTextAlignLast: - case CSSPropertyWebkitTextJustify: - case CSSPropertyWebkitTextUnderlinePosition: -#endif // CSS3_TEXT - case CSSPropertyWebkitTextDecorationsInEffect: - case CSSPropertyWebkitTextEmphasis: - case CSSPropertyWebkitTextEmphasisColor: - case CSSPropertyWebkitTextEmphasisPosition: - case CSSPropertyWebkitTextEmphasisStyle: - case CSSPropertyWebkitTextFillColor: - case CSSPropertyWebkitTextOrientation: - case CSSPropertyWebkitTextSecurity: - case CSSPropertyWebkitTextStroke: - case CSSPropertyWebkitTextStrokeColor: - case CSSPropertyWebkitTextStrokeWidth: - case CSSPropertyWebkitUserModify: - case CSSPropertyWebkitUserSelect: - case CSSPropertyWebkitWritingMode: - case CSSPropertyWhiteSpace: - case CSSPropertyWidows: - case CSSPropertyWordBreak: - case CSSPropertyWordSpacing: - case CSSPropertyWordWrap: -#if ENABLE(SVG) - case CSSPropertyClipRule: - case CSSPropertyColorInterpolation: - case CSSPropertyColorInterpolationFilters: - case CSSPropertyColorRendering: - case CSSPropertyFill: - case CSSPropertyFillOpacity: - case CSSPropertyFillRule: - case CSSPropertyGlyphOrientationHorizontal: - case CSSPropertyGlyphOrientationVertical: - case CSSPropertyKerning: - case CSSPropertyMarker: - case CSSPropertyMarkerEnd: - case CSSPropertyMarkerMid: - case CSSPropertyMarkerStart: - case CSSPropertyStroke: - case CSSPropertyStrokeDasharray: - case CSSPropertyStrokeDashoffset: - case CSSPropertyStrokeLinecap: - case CSSPropertyStrokeLinejoin: - case CSSPropertyStrokeMiterlimit: - case CSSPropertyStrokeOpacity: - case CSSPropertyStrokeWidth: - case CSSPropertyShapeRendering: - case CSSPropertyTextAnchor: - case CSSPropertyWritingMode: -#endif -#if ENABLE(TOUCH_EVENTS) - case CSSPropertyWebkitTapHighlightColor: -#endif - return true; - case CSSPropertyDisplay: - case CSSPropertyZoom: - case CSSPropertyBackground: - case CSSPropertyBackgroundAttachment: - case CSSPropertyBackgroundClip: - case CSSPropertyBackgroundColor: - case CSSPropertyBackgroundImage: - case CSSPropertyBackgroundOrigin: - case CSSPropertyBackgroundPosition: - case CSSPropertyBackgroundPositionX: - case CSSPropertyBackgroundPositionY: - case CSSPropertyBackgroundRepeat: - case CSSPropertyBackgroundRepeatX: - case CSSPropertyBackgroundRepeatY: - case CSSPropertyBackgroundSize: - case CSSPropertyBorder: - case CSSPropertyBorderBottom: - case CSSPropertyBorderBottomColor: - case CSSPropertyBorderBottomLeftRadius: - case CSSPropertyBorderBottomRightRadius: - case CSSPropertyBorderBottomStyle: - case CSSPropertyBorderBottomWidth: - case CSSPropertyBorderColor: - case CSSPropertyBorderImage: - case CSSPropertyBorderImageOutset: - case CSSPropertyBorderImageRepeat: - case CSSPropertyBorderImageSlice: - case CSSPropertyBorderImageSource: - case CSSPropertyBorderImageWidth: - case CSSPropertyBorderLeft: - case CSSPropertyBorderLeftColor: - case CSSPropertyBorderLeftStyle: - case CSSPropertyBorderLeftWidth: - case CSSPropertyBorderRadius: - case CSSPropertyBorderRight: - case CSSPropertyBorderRightColor: - case CSSPropertyBorderRightStyle: - case CSSPropertyBorderRightWidth: - case CSSPropertyBorderStyle: - case CSSPropertyBorderTop: - case CSSPropertyBorderTopColor: - case CSSPropertyBorderTopLeftRadius: - case CSSPropertyBorderTopRightRadius: - case CSSPropertyBorderTopStyle: - case CSSPropertyBorderTopWidth: - case CSSPropertyBorderWidth: - case CSSPropertyBottom: - case CSSPropertyBoxShadow: - case CSSPropertyBoxSizing: - case CSSPropertyClear: - case CSSPropertyClip: - case CSSPropertyContent: - case CSSPropertyCounterIncrement: - case CSSPropertyCounterReset: - case CSSPropertyFloat: - case CSSPropertyFontStretch: -#if ENABLE(CSS_SHADERS) - case CSSPropertyGeometry: -#endif - case CSSPropertyHeight: - case CSSPropertyLeft: - case CSSPropertyMargin: - case CSSPropertyMarginBottom: - case CSSPropertyMarginLeft: - case CSSPropertyMarginRight: - case CSSPropertyMarginTop: - case CSSPropertyMaxHeight: - case CSSPropertyMaxWidth: - case CSSPropertyMinHeight: - case CSSPropertyMinWidth: - case CSSPropertyOpacity: - case CSSPropertyOutline: - case CSSPropertyOutlineColor: - case CSSPropertyOutlineOffset: - case CSSPropertyOutlineStyle: - case CSSPropertyOutlineWidth: - case CSSPropertyOverflow: - case CSSPropertyOverflowWrap: - case CSSPropertyOverflowX: - case CSSPropertyOverflowY: - case CSSPropertyPadding: - case CSSPropertyPaddingBottom: - case CSSPropertyPaddingLeft: - case CSSPropertyPaddingRight: - case CSSPropertyPaddingTop: - case CSSPropertyPage: - case CSSPropertyPageBreakAfter: - case CSSPropertyPageBreakBefore: - case CSSPropertyPageBreakInside: - case CSSPropertyPosition: - case CSSPropertyRight: - case CSSPropertySize: - case CSSPropertySrc: - case CSSPropertyTableLayout: - case CSSPropertyTextLineThrough: - case CSSPropertyTextLineThroughColor: - case CSSPropertyTextLineThroughMode: - case CSSPropertyTextLineThroughStyle: - case CSSPropertyTextLineThroughWidth: - case CSSPropertyTextOverflow: - case CSSPropertyTextOverline: - case CSSPropertyTextOverlineColor: - case CSSPropertyTextOverlineMode: - case CSSPropertyTextOverlineStyle: - case CSSPropertyTextOverlineWidth: - case CSSPropertyTextUnderline: - case CSSPropertyTextUnderlineColor: - case CSSPropertyTextUnderlineMode: - case CSSPropertyTextUnderlineStyle: - case CSSPropertyTextUnderlineWidth: - case CSSPropertyTop: - case CSSPropertyTransition: - case CSSPropertyTransitionDelay: - case CSSPropertyTransitionDuration: - case CSSPropertyTransitionProperty: - case CSSPropertyTransitionTimingFunction: - case CSSPropertyUnicodeBidi: - case CSSPropertyUnicodeRange: - case CSSPropertyVerticalAlign: - case CSSPropertyWidth: - case CSSPropertyZIndex: - case CSSPropertyWebkitAnimation: - case CSSPropertyWebkitAnimationDelay: - case CSSPropertyWebkitAnimationDirection: - case CSSPropertyWebkitAnimationDuration: - case CSSPropertyWebkitAnimationFillMode: - case CSSPropertyWebkitAnimationIterationCount: - case CSSPropertyWebkitAnimationName: - case CSSPropertyWebkitAnimationPlayState: - case CSSPropertyWebkitAnimationTimingFunction: - case CSSPropertyWebkitAppearance: - case CSSPropertyWebkitBackfaceVisibility: - case CSSPropertyWebkitBackgroundBlendMode: - case CSSPropertyWebkitBackgroundClip: - case CSSPropertyWebkitBackgroundComposite: - case CSSPropertyWebkitBackgroundOrigin: - case CSSPropertyWebkitBackgroundSize: - case CSSPropertyWebkitBorderAfter: - case CSSPropertyWebkitBorderAfterColor: - case CSSPropertyWebkitBorderAfterStyle: - case CSSPropertyWebkitBorderAfterWidth: - case CSSPropertyWebkitBorderBefore: - case CSSPropertyWebkitBorderBeforeColor: - case CSSPropertyWebkitBorderBeforeStyle: - case CSSPropertyWebkitBorderBeforeWidth: - case CSSPropertyWebkitBorderEnd: case CSSPropertyWebkitBorderEndColor: case CSSPropertyWebkitBorderEndStyle: case CSSPropertyWebkitBorderEndWidth: - case CSSPropertyWebkitBorderFit: - case CSSPropertyWebkitBorderImage: - case CSSPropertyWebkitBorderRadius: - case CSSPropertyWebkitBorderStart: case CSSPropertyWebkitBorderStartColor: case CSSPropertyWebkitBorderStartStyle: case CSSPropertyWebkitBorderStartWidth: - case CSSPropertyWebkitBoxAlign: -#if ENABLE(CSS_BOX_DECORATION_BREAK) - case CSSPropertyWebkitBoxDecorationBreak: -#endif - case CSSPropertyWebkitBoxFlex: - case CSSPropertyWebkitBoxFlexGroup: - case CSSPropertyWebkitBoxLines: - case CSSPropertyWebkitBoxOrdinalGroup: - case CSSPropertyWebkitBoxOrient: - case CSSPropertyWebkitBoxPack: - case CSSPropertyWebkitBoxReflect: - case CSSPropertyWebkitBoxShadow: - case CSSPropertyWebkitClipPath: - case CSSPropertyWebkitColumnAxis: - case CSSPropertyWebkitColumnBreakAfter: - case CSSPropertyWebkitColumnBreakBefore: - case CSSPropertyWebkitColumnBreakInside: - case CSSPropertyWebkitColumnCount: - case CSSPropertyWebkitColumnGap: - case CSSPropertyWebkitColumnProgression: - case CSSPropertyWebkitColumnRule: - case CSSPropertyWebkitColumnRuleColor: - case CSSPropertyWebkitColumnRuleStyle: - case CSSPropertyWebkitColumnRuleWidth: - case CSSPropertyWebkitColumnSpan: - case CSSPropertyWebkitColumnWidth: - case CSSPropertyWebkitColumns: -#if ENABLE(CSS_FILTERS) - case CSSPropertyWebkitFilter: -#endif -#if ENABLE(CSS_COMPOSITING) - case CSSPropertyWebkitBlendMode: -#endif - case CSSPropertyWebkitAlignContent: - case CSSPropertyWebkitAlignItems: - case CSSPropertyWebkitAlignSelf: - case CSSPropertyWebkitFlex: - case CSSPropertyWebkitFlexBasis: - case CSSPropertyWebkitFlexDirection: - case CSSPropertyWebkitFlexFlow: - case CSSPropertyWebkitFlexGrow: - case CSSPropertyWebkitFlexShrink: - case CSSPropertyWebkitFlexWrap: - case CSSPropertyWebkitJustifyContent: - case CSSPropertyWebkitOrder: - case CSSPropertyWebkitFontSizeDelta: - case CSSPropertyWebkitGridAutoColumns: - case CSSPropertyWebkitGridAutoFlow: - case CSSPropertyWebkitGridAutoRows: - case CSSPropertyWebkitGridDefinitionColumns: - case CSSPropertyWebkitGridDefinitionRows: - case CSSPropertyWebkitGridStart: - case CSSPropertyWebkitGridEnd: - case CSSPropertyWebkitGridBefore: - case CSSPropertyWebkitGridAfter: - case CSSPropertyWebkitGridColumn: - case CSSPropertyWebkitGridRow: - case CSSPropertyWebkitLineClamp: - case CSSPropertyWebkitLogicalWidth: - case CSSPropertyWebkitLogicalHeight: - case CSSPropertyWebkitMarginAfterCollapse: - case CSSPropertyWebkitMarginBeforeCollapse: - case CSSPropertyWebkitMarginBottomCollapse: - case CSSPropertyWebkitMarginTopCollapse: - case CSSPropertyWebkitMarginCollapse: - case CSSPropertyWebkitMarginAfter: - case CSSPropertyWebkitMarginBefore: + case CSSPropertyWebkitBorderBeforeColor: + case CSSPropertyWebkitBorderBeforeStyle: + case CSSPropertyWebkitBorderBeforeWidth: + case CSSPropertyWebkitBorderAfterColor: + case CSSPropertyWebkitBorderAfterStyle: + case CSSPropertyWebkitBorderAfterWidth: case CSSPropertyWebkitMarginEnd: case CSSPropertyWebkitMarginStart: - case CSSPropertyWebkitMarquee: - case CSSPropertyWebkitMarqueeDirection: - case CSSPropertyWebkitMarqueeIncrement: - case CSSPropertyWebkitMarqueeRepetition: - case CSSPropertyWebkitMarqueeSpeed: - case CSSPropertyWebkitMarqueeStyle: - case CSSPropertyWebkitMask: - case CSSPropertyWebkitMaskBoxImage: - case CSSPropertyWebkitMaskBoxImageOutset: - case CSSPropertyWebkitMaskBoxImageRepeat: - case CSSPropertyWebkitMaskBoxImageSlice: - case CSSPropertyWebkitMaskBoxImageSource: - case CSSPropertyWebkitMaskBoxImageWidth: - case CSSPropertyWebkitMaskClip: - case CSSPropertyWebkitMaskComposite: - case CSSPropertyWebkitMaskImage: - case CSSPropertyWebkitMaskOrigin: - case CSSPropertyWebkitMaskPosition: - case CSSPropertyWebkitMaskPositionX: - case CSSPropertyWebkitMaskPositionY: - case CSSPropertyWebkitMaskRepeat: - case CSSPropertyWebkitMaskRepeatX: - case CSSPropertyWebkitMaskRepeatY: - case CSSPropertyWebkitMaskSize: - case CSSPropertyWebkitMaxLogicalWidth: - case CSSPropertyWebkitMaxLogicalHeight: - case CSSPropertyWebkitMinLogicalWidth: - case CSSPropertyWebkitMinLogicalHeight: - case CSSPropertyWebkitPaddingAfter: - case CSSPropertyWebkitPaddingBefore: + case CSSPropertyWebkitMarginBefore: + case CSSPropertyWebkitMarginAfter: case CSSPropertyWebkitPaddingEnd: case CSSPropertyWebkitPaddingStart: - case CSSPropertyWebkitPerspective: - case CSSPropertyWebkitPerspectiveOrigin: - case CSSPropertyWebkitPerspectiveOriginX: - case CSSPropertyWebkitPerspectiveOriginY: -#if ENABLE(CSS3_TEXT) - case CSSPropertyWebkitTextDecorationStyle: - case CSSPropertyWebkitTextDecorationColor: -#endif // CSS3_TEXT - case CSSPropertyWebkitTransform: - case CSSPropertyWebkitTransformOrigin: - case CSSPropertyWebkitTransformOriginX: - case CSSPropertyWebkitTransformOriginY: - case CSSPropertyWebkitTransformOriginZ: - case CSSPropertyWebkitTransformStyle: - case CSSPropertyWebkitTransition: - case CSSPropertyWebkitTransitionDelay: - case CSSPropertyWebkitTransitionDuration: - case CSSPropertyWebkitTransitionProperty: - case CSSPropertyWebkitTransitionTimingFunction: - case CSSPropertyWebkitUserDrag: -#if ENABLE(CSS_REGIONS) - case CSSPropertyWebkitFlowInto: - case CSSPropertyWebkitFlowFrom: - case CSSPropertyWebkitRegionBreakAfter: - case CSSPropertyWebkitRegionBreakBefore: - case CSSPropertyWebkitRegionBreakInside: - case CSSPropertyWebkitRegionFragment: -#endif -#if ENABLE(CSS_EXCLUSIONS) - case CSSPropertyWebkitWrapFlow: - case CSSPropertyWebkitWrapThrough: -#endif -#if ENABLE(CSS_SHAPES) - case CSSPropertyWebkitShapeMargin: - case CSSPropertyWebkitShapePadding: - case CSSPropertyWebkitShapeInside: - case CSSPropertyWebkitShapeOutside: -#endif -#if ENABLE(CSS_SHADERS) - case CSSPropertyMix: - case CSSPropertyParameters: -#endif -#if ENABLE(SVG) - case CSSPropertyClipPath: - case CSSPropertyMask: - case CSSPropertyMaskType: - case CSSPropertyEnableBackground: - case CSSPropertyFilter: - case CSSPropertyFloodColor: - case CSSPropertyFloodOpacity: - case CSSPropertyLightingColor: - case CSSPropertyStopColor: - case CSSPropertyStopOpacity: - case CSSPropertyColorProfile: - case CSSPropertyAlignmentBaseline: - case CSSPropertyBaselineShift: - case CSSPropertyDominantBaseline: - case CSSPropertyVectorEffect: - case CSSPropertyBufferedRendering: - case CSSPropertyWebkitSvgShadow: -#endif -#if ENABLE(DASHBOARD_SUPPORT) - case CSSPropertyWebkitDashboardRegion: -#endif -#if ENABLE(DRAGGABLE_REGION) - case CSSPropertyWebkitAppRegion: -#endif -#if ENABLE(CSS_DEVICE_ADAPTATION) - case CSSPropertyMaxZoom: - case CSSPropertyMinZoom: - case CSSPropertyOrientation: - case CSSPropertyUserZoom: -#endif - return false; - case CSSPropertyInvalid: - ASSERT_NOT_REACHED(); + case CSSPropertyWebkitPaddingBefore: + case CSSPropertyWebkitPaddingAfter: + case CSSPropertyWebkitLogicalWidth: + case CSSPropertyWebkitLogicalHeight: + case CSSPropertyWebkitMinLogicalWidth: + case CSSPropertyWebkitMinLogicalHeight: + case CSSPropertyWebkitMaxLogicalWidth: + case CSSPropertyWebkitMaxLogicalHeight: + return true; + default: return false; } - ASSERT_NOT_REACHED(); - return false; } } // namespace WebCore |