Changeset 91336 in webkit

Timestamp:

Jul 19, 2011 10:41:16 PM (13 years ago)

Author:

macpherson@chromium.org

Message:

Implement CSSPropertyCounterIncrement and CounterReset in CSSStyleApplyProperty.
​https://bugs.webkit.org/show_bug.cgi?id=64846

Reviewed by Dimitri Glazkov.

No new tests / refactoring only.

• css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyCounter
Added class to handle counter properties.
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
Initialize counter property handlers.

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):
Remove old handlers.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-19  Luke Macpherson   <macpherson@chromium.org>
+
+        Implement CSSPropertyCounterIncrement and CounterReset in CSSStyleApplyProperty.
+        https://bugs.webkit.org/show_bug.cgi?id=64846
+
+        Reviewed by Dimitri Glazkov.
+
+        No new tests / refactoring only.
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::ApplyPropertyCounter
+        Added class to handle counter properties.
+        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+        Initialize counter property handlers.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Remove old handlers.
+
 2011-07-19  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -506 +506 @@
     }
 };
+
+enum CounterBehavior {Increment = 0, Reset};
+template <CounterBehavior counterBehavior>
+class ApplyPropertyCounter : public ApplyPropertyBase {
+private:
+    virtual void applyInheritValue(CSSStyleSelector*) const { }
+    virtual void applyInitialValue(CSSStyleSelector*) const { }
+
+    virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
+    {
+        if (!value->isValueList())
+            return;
+
+        CSSValueList* list = static_cast<CSSValueList*>(value);
+
+        CounterDirectiveMap& map = selector->style()->accessCounterDirectives();
+        typedef CounterDirectiveMap::iterator Iterator;
+
+        Iterator end = map.end();
+        for (Iterator it = map.begin(); it != end; ++it)
+            if (counterBehavior)
+                it->second.m_reset = false;
+            else
+                it->second.m_increment = false;
+
+        int length = list ? list->length() : 0;
+        for (int i = 0; i < length; ++i) {
+            CSSValue* currValue = list->itemWithoutBoundsCheck(i);
+            if (!currValue->isPrimitiveValue())
+                continue;
+
+            Pair* pair = static_cast<CSSPrimitiveValue*>(currValue)->getPairValue();
+            if (!pair || !pair->first() || !pair->second())
+                continue;
+
+            AtomicString identifier = static_cast<CSSPrimitiveValue*>(pair->first())->getStringValue();
+            // FIXME: What about overflow?
+            int value = static_cast<CSSPrimitiveValue*>(pair->second())->getIntValue();
+            CounterDirectives& directives = map.add(identifier.impl(), CounterDirectives()).first->second;
+            if (counterBehavior) {
+                directives.m_reset = true;
+                directives.m_resetValue = value;
+            } else {
+                if (directives.m_increment)
+                    directives.m_incrementValue += value;
+                else {
+                    directives.m_increment = true;
+                    directives.m_incrementValue = value;
+                }
+            }
+        }
+    }
+};
+
 
 class ApplyPropertyCursor : public ApplyPropertyBase {
@@ -669 +723 @@
     setPropertyHandler(CSSPropertyCursor, new ApplyPropertyCursor());
 
+    setPropertyHandler(CSSPropertyCounterIncrement, new ApplyPropertyCounter<Increment>());
+    setPropertyHandler(CSSPropertyCounterReset, new ApplyPropertyCounter<Reset>());
+
     setPropertyHandler(CSSPropertyFontStyle, new ApplyPropertyFont<FontItalic>(&FontDescription::italic, &FontDescription::setItalic, FontItalicOff));
     setPropertyHandler(CSSPropertyFontVariant, new ApplyPropertyFont<FontSmallCaps>(&FontDescription::smallCaps, &FontDescription::setSmallCaps, FontSmallCapsOff));

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3563 +3563 @@
 }
 
-static void applyCounterList(RenderStyle* style, CSSValueList* list, bool isReset)
-{
-    CounterDirectiveMap& map = style->accessCounterDirectives();
-    typedef CounterDirectiveMap::iterator Iterator;
-
-    Iterator end = map.end();
-    for (Iterator it = map.begin(); it != end; ++it)
-        if (isReset)
-            it->second.m_reset = false;
-        else
-            it->second.m_increment = false;
-
-    int length = list ? list->length() : 0;
-    for (int i = 0; i < length; ++i) {
-        CSSValue* currValue = list->itemWithoutBoundsCheck(i);
-        if (!currValue->isPrimitiveValue())
-            continue;
-
-        Pair* pair = static_cast<CSSPrimitiveValue*>(currValue)->getPairValue();
-        if (!pair || !pair->first() || !pair->second())
-            continue;
-
-        AtomicString identifier = static_cast<CSSPrimitiveValue*>(pair->first())->getStringValue();
-        // FIXME: What about overflow?
-        int value = static_cast<CSSPrimitiveValue*>(pair->second())->getIntValue();
-        CounterDirectives& directives = map.add(identifier.impl(), CounterDirectives()).first->second;
-        if (isReset) {
-            directives.m_reset = true;
-            directives.m_resetValue = value;
-        } else {
-            if (directives.m_increment)
-                directives.m_incrementValue += value;
-            else {
-                directives.m_increment = true;
-                directives.m_incrementValue = value;
-            }
-        }
-    }
-}
-
 void CSSStyleSelector::applyPropertyToStyle(int id, CSSValue *value, RenderStyle* style)
 {
@@ -4188 +4148 @@
         }
         return;
-
-    case CSSPropertyCounterIncrement:
-        applyCounterList(style(), value->isValueList() ? static_cast<CSSValueList*>(value) : 0, false);
-        return;
-    case CSSPropertyCounterReset:
-        applyCounterList(style(), value->isValueList() ? static_cast<CSSValueList*>(value) : 0, true);
-        return;
-
     case CSSPropertyFontFamily: {
         // list of strings and ids
@@ -5334 +5286 @@
     case CSSPropertyWebkitBorderHorizontalSpacing:
     case CSSPropertyWebkitBorderVerticalSpacing:
+    case CSSPropertyCounterIncrement:
+    case CSSPropertyCounterReset:
     case CSSPropertyLetterSpacing:
     case CSSPropertyWordSpacing: