Changeset 175625 in webkit

Timestamp:

Nov 5, 2014 10:24:57 AM (10 years ago)

Author:

Chris Dumez

Message:

Move text-align CSS property to the new StyleBuilder
​https://bugs.webkit.org/show_bug.cgi?id=138398

Reviewed by Antti Koivisto.

Move text-align CSS property from DeprecatedStyleBuilder to the new
StyleBuilder so that it is now generated from CSSPropertyNames.in.
This patch adds a TextAlign Converter to support this.

No new tests, no behavior change.

• css/CSSPropertyNames.in:
• css/DeprecatedStyleBuilder.cpp:

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyTextAlign::applyValue): Deleted.
(WebCore::ApplyPropertyTextAlign::createHandler): Deleted.

• css/StyleBuilderConverter.h:

(WebCore::StyleBuilderConverter::convertTextAlign):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-05  Chris Dumez  <cdumez@apple.com>
+
+        Move text-align CSS property to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=138398
+
+        Reviewed by Antti Koivisto.
+
+        Move text-align CSS property from DeprecatedStyleBuilder to the new
+        StyleBuilder so that it is now generated from CSSPropertyNames.in.
+        This patch adds a TextAlign Converter to support this.
+
+        No new tests, no behavior change.
+
+        * css/CSSPropertyNames.in:
+        * css/DeprecatedStyleBuilder.cpp:
+        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+        (WebCore::ApplyPropertyTextAlign::applyValue): Deleted.
+        (WebCore::ApplyPropertyTextAlign::createHandler): Deleted.
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertTextAlign):
+
 2014-11-05  Sanghyup Lee  <sh53.lee@samsung.com>
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -216 +216 @@
 table-layout [NewStyleBuilder]
 tab-size [Inherited, NewStyleBuilder, TypeName=unsigned]
-text-align [Inherited]
+text-align [Inherited, NewStyleBuilder, Converter=TextAlign]
 text-decoration [NewStyleBuilder, Converter=TextDecoration]
 text-indent [Inherited]

trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

@@ -978 +978 @@
 
     static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
-class ApplyPropertyTextAlign {
-public:
-    static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
-    {
-        if (!is<CSSPrimitiveValue>(*value))
-            return;
-
-        CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
-        ASSERT(primitiveValue.isValueID());
-
-        if (primitiveValue.getValueID() != CSSValueWebkitMatchParent)
-            styleResolver->style()->setTextAlign(primitiveValue);
-        else if (styleResolver->parentStyle()->textAlign() == TASTART)
-            styleResolver->style()->setTextAlign(styleResolver->parentStyle()->isLeftToRightDirection() ? LEFT : RIGHT);
-        else if (styleResolver->parentStyle()->textAlign() == TAEND)
-            styleResolver->style()->setTextAlign(styleResolver->parentStyle()->isLeftToRightDirection() ? RIGHT : LEFT);
-        else
-            styleResolver->style()->setTextAlign(styleResolver->parentStyle()->textAlign());
-    }
-    static PropertyHandler createHandler()
-    {
-        PropertyHandler handler = ApplyPropertyDefaultBase<ETextAlign, &RenderStyle::textAlign, ETextAlign, &RenderStyle::setTextAlign, ETextAlign, &RenderStyle::initialTextAlign>::createHandler();
-        return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
-    }
 };
 
@@ -1938 +1912 @@
     setPropertyHandler(CSSPropertyResize, ApplyPropertyResize::createHandler());
     setPropertyHandler(CSSPropertySize, ApplyPropertyPageSize::createHandler());
-    setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler());
     setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler());
     setPropertyHandler(CSSPropertyWebkitTextDecorationSkip, ApplyPropertyTextDecorationSkip::createHandler());

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -58 +58 @@
     static String convertStringOrNone(StyleResolver&, CSSValue&);
     static TextEmphasisPosition convertTextEmphasisPosition(StyleResolver&, CSSValue&);
+    static ETextAlign convertTextAlign(StyleResolver&, CSSValue&);
 
 private:
@@ -308 +309 @@
 }
 
+inline ETextAlign StyleBuilderConverter::convertTextAlign(StyleResolver& styleResolver, CSSValue& value)
+{
+    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+    ASSERT(primitiveValue.isValueID());
+
+    if (primitiveValue.getValueID() != CSSValueWebkitMatchParent)
+        return primitiveValue;
+
+    auto* parentStyle = styleResolver.parentStyle();
+    if (parentStyle->textAlign() == TASTART)
+        return parentStyle->isLeftToRightDirection() ? LEFT : RIGHT;
+    if (parentStyle->textAlign() == TAEND)
+        return parentStyle->isLeftToRightDirection() ? RIGHT : LEFT;
+    return parentStyle->textAlign();
+}
+
 } // namespace WebCore