Changeset 102650 in webkit

Timestamp:

Dec 12, 2011 6:36:47 PM (12 years ago)

Author:

macpherson@chromium.org

Message:

Implement CSS text-decoration property in CSSStyleApplyProperty.
​https://bugs.webkit.org/show_bug.cgi?id=74258

Reviewed by Andreas Kling.

No new tests / refactoring only.

• css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyTextDecoration::applyValue):
(WebCore::ApplyPropertyTextDecoration::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-12-12  Luke Macpherson   <macpherson@chromium.org>
+
+        Implement CSS text-decoration property in CSSStyleApplyProperty.
+        https://bugs.webkit.org/show_bug.cgi?id=74258
+
+        Reviewed by Andreas Kling.
+
+        No new tests / refactoring only.
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::ApplyPropertyTextDecoration::applyValue):
+        (WebCore::ApplyPropertyTextDecoration::createHandler):
+        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+
 2011-12-12  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -867 +867 @@
     {
         PropertyHandler handler = ApplyPropertyDefaultBase<ETextAlign, &RenderStyle::textAlign, ETextAlign, &RenderStyle::setTextAlign, ETextAlign, &RenderStyle::initialTextAlign>::createHandler();
+        return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
+    }
+};
+
+class ApplyPropertyTextDecoration {
+public:
+    static void applyValue(CSSStyleSelector* selector, CSSValue* value)
+    {
+        ETextDecoration t = RenderStyle::initialTextDecoration();
+        for (CSSValueListIterator i(value); i.hasMore(); i.advance()) {
+            CSSValue* item = i.value();
+            ASSERT(item->isPrimitiveValue());
+            t |= *static_cast<CSSPrimitiveValue*>(item);
+        }
+        selector->style()->setTextDecoration(t);
+    }
+    static PropertyHandler createHandler()
+    {
+        PropertyHandler handler = ApplyPropertyDefaultBase<ETextDecoration, &RenderStyle::textDecoration, ETextDecoration, &RenderStyle::setTextDecoration, ETextDecoration, &RenderStyle::initialTextDecoration>::createHandler();
         return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
     }
@@ -1545 +1564 @@
 
     setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler());
+    setPropertyHandler(CSSPropertyTextDecoration, ApplyPropertyTextDecoration::createHandler());
 
     setPropertyHandler(CSSPropertyOutlineStyle, ApplyPropertyOutlineStyle::createHandler());

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3049 +3049 @@
             setFontDescription(fontDescription);
         }
-        return;
-    }
-    case CSSPropertyTextDecoration: {
-        // list of ident
-        HANDLE_INHERIT_AND_INITIAL(textDecoration, TextDecoration)
-        ETextDecoration t = RenderStyle::initialTextDecoration();
-        for (CSSValueListIterator i = value; i.hasMore(); i.advance()) {
-            CSSValue* item = i.value();
-            ASSERT(item->isPrimitiveValue());
-            t |= *static_cast<CSSPrimitiveValue*>(item);
-        }
-        m_style->setTextDecoration(t);
         return;
     }
@@ -3867 +3855 @@
     case CSSPropertySize:
     case CSSPropertyTextAlign:
+    case CSSPropertyTextDecoration:
     case CSSPropertyTextIndent:
     case CSSPropertyMaxHeight: