Changeset 175932 in webkit

Timestamp:

Nov 11, 2014, 8:31:44 AM (12 years ago)

Author:

Chris Dumez

Message:

Move '-webkit-marquee-speed' CSS property to the new StyleBuilder
​https://bugs.webkit.org/show_bug.cgi?id=138595

Reviewed by Antti Koivisto.

Move '-webkit-marquee-speed' CSS property from DeprecatedStyleBuilder
to the new StyleBuilder by adding a new MarqueeSpeed Converter.

No new tests, no behavior change.

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

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

• css/StyleBuilderConverter.h:

(WebCore::StyleBuilderConverter::convertMarqueeSpeed):

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-11  Chris Dumez  <cdumez@apple.com>
+
+        Move '-webkit-marquee-speed' CSS property to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=138595
+
+        Reviewed by Antti Koivisto.
+
+        Move '-webkit-marquee-speed' CSS property from DeprecatedStyleBuilder
+        to the new StyleBuilder by adding a new MarqueeSpeed Converter.
+
+        No new tests, no behavior change.
+
+        * css/CSSPropertyNames.in:
+        * css/DeprecatedStyleBuilder.cpp:
+        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+        (WebCore::ApplyPropertyMarqueeSpeed::applyValue): Deleted.
+        (WebCore::ApplyPropertyMarqueeSpeed::createHandler): Deleted.
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertMarqueeSpeed):
+
 2014-10-07  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -422 +422 @@
 -webkit-marquee-increment [NewStyleBuilder, Custom=Value]
 -webkit-marquee-repetition
--webkit-marquee-speed
+-webkit-marquee-speed [NewStyleBuilder, Converter=MarqueeSpeed]
 -webkit-marquee-style [NewStyleBuilder, TypeName=EMarqueeBehavior, NameForMethods=MarqueeBehavior]
 -webkit-mask

trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

@@ -1048 +1048 @@
     {
         PropertyHandler handler = ApplyPropertyDefault<int, &RenderStyle::marqueeLoopCount, int, &RenderStyle::setMarqueeLoopCount, int, &RenderStyle::initialMarqueeLoopCount>::createHandler();
-        return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
-    }
-};
-
-class ApplyPropertyMarqueeSpeed {
-public:
-    static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
-    {
-        if (!is<CSSPrimitiveValue>(*value))
-            return;
-
-        CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
-        if (CSSValueID ident = primitiveValue.getValueID()) {
-            switch (ident) {
-            case CSSValueSlow:
-                styleResolver->style()->setMarqueeSpeed(500); // 500 msec.
-                break;
-            case CSSValueNormal:
-                styleResolver->style()->setMarqueeSpeed(85); // 85msec. The WinIE default.
-                break;
-            case CSSValueFast:
-                styleResolver->style()->setMarqueeSpeed(10); // 10msec. Super fast.
-                break;
-            default:
-                break;
-            }
-        } else if (primitiveValue.isTime())
-            styleResolver->style()->setMarqueeSpeed(primitiveValue.computeTime<int, CSSPrimitiveValue::Milliseconds>());
-        else if (primitiveValue.isNumber()) // For scrollamount support.
-            styleResolver->style()->setMarqueeSpeed(primitiveValue.getIntValue());
-    }
-    static PropertyHandler createHandler()
-    {
-        PropertyHandler handler = ApplyPropertyDefault<int, &RenderStyle::marqueeSpeed, int, &RenderStyle::setMarqueeSpeed, int, &RenderStyle::initialMarqueeSpeed>::createHandler();
         return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
     }
@@ -1627 +1593 @@
     setPropertyHandler(CSSPropertyWebkitFontVariantLigatures, ApplyPropertyFontVariantLigatures::createHandler());
     setPropertyHandler(CSSPropertyWebkitMarqueeRepetition, ApplyPropertyMarqueeRepetition::createHandler());
-    setPropertyHandler(CSSPropertyWebkitMarqueeSpeed, ApplyPropertyMarqueeSpeed::createHandler());
     setPropertyHandler(CSSPropertyWebkitMaskBoxImageOutset, ApplyPropertyBorderImageModifier<BorderMask, Outset>::createHandler());
     setPropertyHandler(CSSPropertyWebkitMaskBoxImageRepeat, ApplyPropertyBorderImageModifier<BorderMask, Repeat>::createHandler());

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -64 +64 @@
     static PassRefPtr<ClipPathOperation> convertClipPath(StyleResolver&, CSSValue&);
     static EResize convertResize(StyleResolver&, CSSValue&);
+    static int convertMarqueeSpeed(StyleResolver&, CSSValue&);
 
 private:
@@ -388 +389 @@
 }
 
+inline int StyleBuilderConverter::convertMarqueeSpeed(StyleResolver&, CSSValue& value)
+{
+    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+    int speed = 85;
+    if (CSSValueID ident = primitiveValue.getValueID()) {
+        switch (ident) {
+        case CSSValueSlow:
+            speed = 500; // 500 msec.
+            break;
+        case CSSValueNormal:
+            speed = 85; // 85msec. The WinIE default.
+            break;
+        case CSSValueFast:
+            speed = 10; // 10msec. Super fast.
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+            break;
+        }
+    } else if (primitiveValue.isTime())
+        speed = primitiveValue.computeTime<int, CSSPrimitiveValue::Milliseconds>();
+    else {
+        // For scrollamount support.
+        ASSERT(primitiveValue.isNumber());
+        speed = primitiveValue.getIntValue();
+    }
+    return speed;
+}
+
 } // namespace WebCore