Changeset 175467 in webkit

Timestamp:

Nov 3, 2014 3:08:33 AM (9 years ago)

Author:

Chris Dumez

Message:

Move 'zoom' CSS property to the new StyleBuilder
​https://bugs.webkit.org/show_bug.cgi?id=138297

Reviewed by Antti Koivisto.

Move 'zoom' CSS property from DeprecatedStyleBuilder to the new
StyleBuilder by using custom code as it requires special handling.

No new tests, no behavior change.

• css/makeprop.pl:

Add support for Custom=All StyleBuilder option to indicate
that the property requires custom code to set the initial,
inherit and current values.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-03  Chris Dumez  <cdumez@apple.com>
+
+        Move 'zoom' CSS property to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=138297
+
+        Reviewed by Antti Koivisto.
+
+        Move 'zoom' CSS property from DeprecatedStyleBuilder to the new
+        StyleBuilder by using custom code as it requires special handling.
+
+        No new tests, no behavior change.
+
+        * css/makeprop.pl:
+        Add support for Custom=All StyleBuilder option to indicate
+        that the property requires custom code to set the initial,
+        inherit and current values.
+
 2014-11-03  Sungmann Cho  <sungmann.cho@navercorp.com>
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -45 +45 @@
 // css/StyleBuilderConverter.h should be used.
 //
-// * Custom=Value:
-// This option is used to indicate that the CSS property requires special
+// * Custom=[Value|All]:
+// Custom=Value option is used to indicate that the CSS property requires special
 // handling to set its value, and a regular Converter helper cannot be
 // used. The Custom code for the property should be located in
 // css/StyleBuilderCustom.h and named applyValue[CSSPropertyName]().
+// If special handling is also needed to apply inherit or initial value, use
+// Custom=All.
 
 
@@ -76 +78 @@
 -webkit-writing-mode [Inherited]
 -epub-writing-mode = -webkit-writing-mode
-zoom
+zoom [NewStyleBuilder, Custom=All]
 
 // line height needs to be right after the above high-priority properties

trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

@@ -1701 +1701 @@
         styleResolver->style()->setAspectRatioDenominator(aspectRatioValue.denominatorValue());
         styleResolver->style()->setAspectRatioNumerator(aspectRatioValue.numeratorValue());
-    }
-
-    static PropertyHandler createHandler()
-    {
-        return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue);
-    }
-};
-
-class ApplyPropertyZoom {
-private:
-    static void resetEffectiveZoom(StyleResolver* styleResolver)
-    {
-        // Reset the zoom in effect. This allows the setZoom method to accurately compute a new zoom in effect.
-        styleResolver->setEffectiveZoom(styleResolver->parentStyle() ? styleResolver->parentStyle()->effectiveZoom() : RenderStyle::initialZoom());
-    }
-
-public:
-    static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
-    {
-        resetEffectiveZoom(styleResolver);
-        styleResolver->setZoom(styleResolver->parentStyle()->zoom());
-    }
-
-    static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
-    {
-        resetEffectiveZoom(styleResolver);
-        styleResolver->setZoom(RenderStyle::initialZoom());
-    }
-
-    static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
-    {
-        CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
-
-        if (primitiveValue.getValueID() == CSSValueNormal) {
-            resetEffectiveZoom(styleResolver);
-            styleResolver->setZoom(RenderStyle::initialZoom());
-        } else if (primitiveValue.getValueID() == CSSValueReset) {
-            styleResolver->setEffectiveZoom(RenderStyle::initialZoom());
-            styleResolver->setZoom(RenderStyle::initialZoom());
-        } else if (primitiveValue.getValueID() == CSSValueDocument) {
-            float docZoom = styleResolver->rootElementStyle() ? styleResolver->rootElementStyle()->zoom() : RenderStyle::initialZoom();
-            styleResolver->setEffectiveZoom(docZoom);
-            styleResolver->setZoom(docZoom);
-        } else if (primitiveValue.isPercentage()) {
-            resetEffectiveZoom(styleResolver);
-            if (float percent = primitiveValue.getFloatValue())
-                styleResolver->setZoom(percent / 100.0f);
-        } else if (primitiveValue.isNumber()) {
-            resetEffectiveZoom(styleResolver);
-            if (float number = primitiveValue.getFloatValue())
-                styleResolver->setZoom(number);
-        }
     }
 
@@ -2130 +2078 @@
 
     setPropertyHandler(CSSPropertyZIndex, ApplyPropertyAuto<int, &RenderStyle::zIndex, &RenderStyle::setZIndex, &RenderStyle::hasAutoZIndex, &RenderStyle::setHasAutoZIndex>::createHandler());
-    setPropertyHandler(CSSPropertyZoom, ApplyPropertyZoom::createHandler());
 }
 

trunk/Source/WebCore/css/StyleBuilderCustom.h

@@ -67 +67 @@
 }
 
+static inline void resetEffectiveZoom(StyleResolver& styleResolver)
+{
+    // Reset the zoom in effect. This allows the setZoom method to accurately compute a new zoom in effect.
+    styleResolver.setEffectiveZoom(styleResolver.parentStyle() ? styleResolver.parentStyle()->effectiveZoom() : RenderStyle::initialZoom());
+}
+
+inline void applyInitialZoom(StyleResolver& styleResolver)
+{
+    resetEffectiveZoom(styleResolver);
+    styleResolver.setZoom(RenderStyle::initialZoom());
+}
+
+inline void applyInheritZoom(StyleResolver& styleResolver)
+{
+    resetEffectiveZoom(styleResolver);
+    styleResolver.setZoom(styleResolver.parentStyle()->zoom());
+}
+
+inline void applyValueZoom(StyleResolver& styleResolver, CSSValue& value)
+{
+    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+    if (primitiveValue.getValueID() == CSSValueNormal) {
+        resetEffectiveZoom(styleResolver);
+        styleResolver.setZoom(RenderStyle::initialZoom());
+    } else if (primitiveValue.getValueID() == CSSValueReset) {
+        styleResolver.setEffectiveZoom(RenderStyle::initialZoom());
+        styleResolver.setZoom(RenderStyle::initialZoom());
+    } else if (primitiveValue.getValueID() == CSSValueDocument) {
+        float docZoom = styleResolver.rootElementStyle() ? styleResolver.rootElementStyle()->zoom() : RenderStyle::initialZoom();
+        styleResolver.setEffectiveZoom(docZoom);
+        styleResolver.setZoom(docZoom);
+    } else if (primitiveValue.isPercentage()) {
+        resetEffectiveZoom(styleResolver);
+        if (float percent = primitiveValue.getFloatValue())
+            styleResolver.setZoom(percent / 100.0f);
+    } else if (primitiveValue.isNumber()) {
+        resetEffectiveZoom(styleResolver);
+        if (float number = primitiveValue.getFloatValue())
+            styleResolver.setZoom(number);
+    }
+}
+
 } // namespace StyleBuilderFunctions
 

trunk/Source/WebCore/css/makeprop.pl

@@ -380 +380 @@
   next unless exists($propertiesUsingNewStyleBuilder{$name});
 
+  next if $propertiesUsingNewStyleBuilder{$name}{"Custom"} eq "All";
+
   my $setValue = "styleResolver.style()->" . $propertiesUsingNewStyleBuilder{$name}{"Setter"};
   print STYLEBUILDER "    inline void applyInitial" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";