Changeset 101221 in webkit

Timestamp:

Nov 27, 2011, 10:19:11 PM (15 years ago)

Author:

macpherson@chromium.org

Message:

Implement CSSPropertyTextAlign in CSSStyleApplyProperty.
​https://bugs.webkit.org/show_bug.cgi?id=73102

Reviewed by Andreas Kling.

Covered by fast/css/text-align*.html

• css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyTextAlign::applyValue):
(WebCore::ApplyPropertyTextAlign::createHandler):
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleApplyProperty.cpp (modified) (2 diffs)
• css/CSSStyleSelector.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-27  Luke Macpherson   <macpherson@chromium.org>
+
+        Implement CSSPropertyTextAlign in CSSStyleApplyProperty.
+        https://bugs.webkit.org/show_bug.cgi?id=73102
+
+        Reviewed by Andreas Kling.
+
+        Covered by fast/css/text-align*.html
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::ApplyPropertyTextAlign::applyValue):
+        (WebCore::ApplyPropertyTextAlign::createHandler):
+        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+
 2011-11-27  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -686 +686 @@
 };
 
+class ApplyPropertyTextAlign {
+public:
+    static void applyValue(CSSStyleSelector* selector, CSSValue* value)
+    {
+        if (!value->isPrimitiveValue())
+            return;
+
+        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
+
+        if (primitiveValue->getIdent() != CSSValueWebkitMatchParent)
+            selector->style()->setTextAlign(*primitiveValue);
+        else if (selector->parentStyle()->textAlign() == TASTART)
+            selector->style()->setTextAlign(selector->parentStyle()->isLeftToRightDirection() ? LEFT : RIGHT);
+        else if (selector->parentStyle()->textAlign() == TAEND)
+            selector->style()->setTextAlign(selector->parentStyle()->isLeftToRightDirection() ? RIGHT : LEFT);
+        else
+            selector->style()->setTextAlign(selector->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);
+    }
+};
+
 class ApplyPropertyTextEmphasisStyle {
 public:
@@ -1013 +1038 @@
     setPropertyHandler(CSSPropertyFontWeight, ApplyPropertyFontWeight::createHandler());
 
+    setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler());
+
     setPropertyHandler(CSSPropertyOutlineStyle, ApplyPropertyOutlineStyle::createHandler());
     setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<InheritFromParent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle::setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler());

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -2779 +2779 @@
             return;
         m_style->setLineHeight(lineHeight);
-        return;
-    }
-
-// string
-    case CSSPropertyTextAlign:
-    {
-        HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign)
-        if (!primitiveValue)
-            return;
-        if (primitiveValue->getIdent() == CSSValueWebkitMatchParent) {
-            if (m_parentStyle->textAlign() == TASTART)
-                m_style->setTextAlign(m_parentStyle->isLeftToRightDirection() ? LEFT : RIGHT);
-            else if (m_parentStyle->textAlign() == TAEND)
-                m_style->setTextAlign(m_parentStyle->isLeftToRightDirection() ? RIGHT : LEFT);
-            else
-                m_style->setTextAlign(m_parentStyle->textAlign());
-            return;
-        }
-        m_style->setTextAlign(*primitiveValue);
         return;
     }
@@ -4025 +4006 @@
     case CSSPropertyPaddingLeft:
     case CSSPropertyPadding:
+    case CSSPropertyTextAlign:
     case CSSPropertyTextIndent:
     case CSSPropertyMaxHeight: