Changeset 175464 in webkit

Timestamp:

Nov 2, 2014 2:47:30 PM (9 years ago)

Author:

Chris Dumez

Message:

Move string-typed properties to the new StyleBuilder
​https://bugs.webkit.org/show_bug.cgi?id=138295

Reviewed by Antti Koivisto.

Move string-typed properties to the new StyleBuilder:
-webkit-hyphenate-character
-webkit-line-grid
-webkit-flow-into
-webkit-flow-from

No new tests, no behavior change.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPropertyNames.in (modified) (3 diffs)
• css/DeprecatedStyleBuilder.cpp (modified) (2 diffs)
• css/StyleBuilderConverter.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-02  Chris Dumez  <cdumez@apple.com>
+
+        Move string-typed properties to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=138295
+
+        Reviewed by Antti Koivisto.
+
+        Move string-typed properties to the new StyleBuilder:
+        -webkit-hyphenate-character
+        -webkit-line-grid
+        -webkit-flow-into
+        -webkit-flow-from
+
+        No new tests, no behavior change.
+
 2014-11-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -388 +388 @@
 -webkit-grid-auto-flow
 #endif
--webkit-hyphenate-character [Inherited]
+-webkit-hyphenate-character [Inherited, NewStyleBuilder, NameForMethods=HyphenationString, Converter=StringOrAuto]
 -webkit-hyphenate-limit-after [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitAfter, Converter=Number<short>]
 -webkit-hyphenate-limit-before [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitBefore, Converter=Number<short>]
@@ -399 +399 @@
 -webkit-line-break [Inherited, NewStyleBuilder, TypeName=LineBreak]
 -webkit-line-clamp [NewStyleBuilder, TypeName=LineClampValue]
--webkit-line-grid [Inherited]
+-webkit-line-grid [Inherited, NewStyleBuilder, Converter=StringOrNone]
 -webkit-line-snap [Inherited, NewStyleBuilder, TypeName=LineSnap]
 -webkit-logical-width
@@ -505 +505 @@
 -webkit-user-select [Inherited, NewStyleBuilder]
 #if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
--webkit-flow-into
--webkit-flow-from
+-webkit-flow-into [NewStyleBuilder, NameForMethods=FlowThread, Converter=StringOrNone]
+-webkit-flow-from [NewStyleBuilder, NameForMethods=RegionThread, Converter=StringOrNone]
 -webkit-region-fragment [NewStyleBuilder, TypeName=RegionFragment]
 -webkit-region-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]

trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

@@ -301 +301 @@
 
     static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
-enum StringIdentBehavior { NothingMapsToNull = 0, MapNoneToNull, MapAutoToNull };
-template <StringIdentBehavior identBehavior, const AtomicString& (RenderStyle::*getterFunction)() const, void (RenderStyle::*setterFunction)(const AtomicString&), const AtomicString& (*initialFunction)()>
-class ApplyPropertyString {
-public:
-    static void setValue(RenderStyle* style, const AtomicString& value) { (style->*setterFunction)(value); }
-    static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
-    {
-        if (!is<CSSPrimitiveValue>(*value))
-            return;
-        CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
-        if ((identBehavior == MapNoneToNull && primitiveValue.getValueID() == CSSValueNone)
-            || (identBehavior == MapAutoToNull && primitiveValue.getValueID() == CSSValueAuto))
-            setValue(styleResolver->style(), nullAtom);
-        else
-            setValue(styleResolver->style(), primitiveValue.getStringValue());
-    }
-    static PropertyHandler createHandler()
-    {
-        PropertyHandler handler = ApplyPropertyDefaultBase<const AtomicString&, getterFunction, const AtomicString&, setterFunction, const AtomicString&, initialFunction>::createHandler();
-        return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
-    }
 };
 
@@ -2116 +2093 @@
     setPropertyHandler(CSSPropertyColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
     setPropertyHandler(CSSPropertyColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
-#if ENABLE(CSS_REGIONS)
-    setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
-    setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapNoneToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
-#endif
     setPropertyHandler(CSSPropertyWebkitFontKerning, ApplyPropertyFont<FontDescription::Kerning, &FontDescription::kerning, &FontDescription::setKerning, FontDescription::AutoKerning>::createHandler());
     setPropertyHandler(CSSPropertyWebkitFontSmoothing, ApplyPropertyFont<FontSmoothingMode, &FontDescription::fontSmoothing, &FontDescription::setFontSmoothing, AutoSmoothing>::createHandler());
     setPropertyHandler(CSSPropertyWebkitFontVariantLigatures, ApplyPropertyFontVariantLigatures::createHandler());
-    setPropertyHandler(CSSPropertyWebkitHyphenateCharacter, ApplyPropertyString<MapAutoToNull, &RenderStyle::hyphenationString, &RenderStyle::setHyphenationString, &RenderStyle::initialHyphenationString>::createHandler());
-    setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString<MapNoneToNull, &RenderStyle::lineGrid, &RenderStyle::setLineGrid, &RenderStyle::initialLineGrid>::createHandler());
     setPropertyHandler(CSSPropertyWebkitMarqueeRepetition, ApplyPropertyMarqueeRepetition::createHandler());
     setPropertyHandler(CSSPropertyWebkitMarqueeSpeed, ApplyPropertyMarqueeSpeed::createHandler());

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -54 +54 @@
     template <CSSPropertyID property> static PassRefPtr<StyleImage> convertBorderImageSource(StyleResolver&, CSSValue&);
     static TransformOperations convertTransform(StyleResolver&, CSSValue&);
+    static String convertString(StyleResolver&, CSSValue&);
+    static String convertStringOrAuto(StyleResolver&, CSSValue&);
+    static String convertStringOrNone(StyleResolver&, CSSValue&);
 
 private:
@@ -250 +253 @@
 }
 
+inline String StyleBuilderConverter::convertString(StyleResolver&, CSSValue& value)
+{
+    return downcast<CSSPrimitiveValue>(value).getStringValue();
+}
+
+inline String StyleBuilderConverter::convertStringOrAuto(StyleResolver& styleResolver, CSSValue& value)
+{
+    if (downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueAuto)
+        return nullAtom;
+    return convertString(styleResolver, value);
+}
+
+inline String StyleBuilderConverter::convertStringOrNone(StyleResolver& styleResolver, CSSValue& value)
+{
+    if (downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNone)
+        return nullAtom;
+    return convertString(styleResolver, value);
+}
+
 } // namespace WebCore