Move Color and FillLayer properties to new StyleBuilder

Move Color and FillLayer properties to new StyleBuilder

Now that most of the new StyleBuilder infrastructure is in place, we can
start moving all the properties across. This change moves across
ApplyPropertyColor and ApplyPropertyFillLayer properties to the new
system.

Also added a use_handlers_for option to CSSProperties.in, and friended
StyleBuilderCustom from RenderStyle for access to color setters.

BUG=237400
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=152021

[eseidel, 2013-06-07 07:41:32]

lgtm

[commit-bot: I haz the power, 2013-06-07 07:41:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/timloh@chromium.org/16530002/1

[commit-bot: I haz the power, 2013-06-07 07:41:50]

Failed to apply patch for Source/core/css/DeprecatedStyleBuilder.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/css/DeprecatedStyleBuilder.cpp
  Hunk #1 FAILED at 267.
  Hunk #3 succeeded at 1737 (offset 4 lines).
  Hunk #4 succeeded at 1745 (offset 4 lines).
  Hunk #5 succeeded at 1765 (offset 4 lines).
  Hunk #6 succeeded at 1773 (offset 4 lines).
  Hunk #7 succeeded at 1789 (offset 4 lines).
  Hunk #8 succeeded at 1809 (offset 4 lines).
  1 out of 8 hunks FAILED -- saving rejects to file
Source/core/css/DeprecatedStyleBuilder.cpp.rej

Patch:       Source/core/css/DeprecatedStyleBuilder.cpp
Index: Source/core/css/DeprecatedStyleBuilder.cpp
diff --git a/Source/core/css/DeprecatedStyleBuilder.cpp
b/Source/core/css/DeprecatedStyleBuilder.cpp
index
cc68580cea56d4cac86c50ac97907c11abde7298..4ed144cdd2784386f8390f856e13732b768fc82e
100644
--- a/Source/core/css/DeprecatedStyleBuilder.cpp
+++ b/Source/core/css/DeprecatedStyleBuilder.cpp
@@ -267,56 +267,6 @@ public:
     static PropertyHandler createHandler() { return
PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
 };
 
-enum ColorInherit {NoInheritFromParent = 0, InheritFromParent};
-Color defaultInitialColor();
-Color defaultInitialColor() { return Color(); }
-template <ColorInherit inheritColorFromParent,
-          Color (RenderStyle::*getterFunction)() const,
-          void (RenderStyle::*setterFunction)(const Color&),
-          void (RenderStyle::*visitedLinkSetterFunction)(const Color&),
-          Color (RenderStyle::*defaultFunction)() const,
-          Color (*initialFunction)() = &defaultInitialColor>
-class ApplyPropertyColor {
-public:
-    static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
-    {
-        // Visited link style can never explicitly inherit from parent visited
link style so no separate getters are needed.
-        Color color = (styleResolver->parentStyle()->*getterFunction)();
-        applyColorValue(styleResolver, color.isValid() ? color :
(styleResolver->parentStyle()->*defaultFunction)());
-    }
-
-    static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
-    {
-        applyColorValue(styleResolver, initialFunction());
-    }
-
-    static void applyValue(CSSPropertyID propertyID, StyleResolver*
styleResolver, CSSValue* value)
-    {
-        if (!value->isPrimitiveValue())
-            return;
-
-        CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-        if (inheritColorFromParent && primitiveValue->getIdent() ==
CSSValueCurrentcolor)
-            applyInheritValue(propertyID, styleResolver);
-        else {
-            if (styleResolver->applyPropertyToRegularStyle())
-               
(styleResolver->style()->*setterFunction)(styleResolver->colorFromPrimitiveValue(primitiveValue));
-            if (styleResolver->applyPropertyToVisitedLinkStyle())
-               
(styleResolver->style()->*visitedLinkSetterFunction)(styleResolver->colorFromPrimitiveValue(primitiveValue,
/* forVisitedLink */ true));
-        }
-    }
-
-    static void applyColorValue(StyleResolver* styleResolver, const Color&
color)
-    {
-        if (styleResolver->applyPropertyToRegularStyle())
-            (styleResolver->style()->*setterFunction)(color);
-        if (styleResolver->applyPropertyToVisitedLinkStyle())
-            (styleResolver->style()->*visitedLinkSetterFunction)(color);
-    }
-
-    static PropertyHandler createHandler() { return
PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
 template <TextDirection (RenderStyle::*getterFunction)() const, void
(RenderStyle::*setterFunction)(TextDirection), TextDirection
(*initialFunction)()>
 class ApplyPropertyDirection {
 public:
@@ -409,94 +359,6 @@ public:
     }
 };
 
-template <typename T>
-struct FillLayerAccessorTypes {
-    typedef T Setter;
-    typedef T Getter;
-};
-
-template <>
-struct FillLayerAccessorTypes<StyleImage*> {
-    typedef PassRefPtr<StyleImage> Setter;
-    typedef StyleImage* Getter;
-};
-
-template <typename T,
-          CSSPropertyID propertyId,
-          EFillLayerType fillLayerType,
-          FillLayer* (RenderStyle::*accessLayersFunction)(),
-          const FillLayer* (RenderStyle::*layersFunction)() const,
-          bool (FillLayer::*testFunction)() const,
-          typename FillLayerAccessorTypes<T>::Getter
(FillLayer::*getFunction)() const,
-          void (FillLayer::*setFunction)(typename
FillLayerAccessorTypes<T>::Setter),
-          void (FillLayer::*clearFunction)(),
-          typename FillLayerAccessorTypes<T>::Getter
(*initialFunction)(EFillLayerType),
-          void (CSSToStyleMap::*mapFillFunction)(CSSPropertyID, FillLayer*,
CSSValue*)>
-class ApplyPropertyFillLayer {
-public:
-    static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
-    {
-        FillLayer* currChild =
(styleResolver->style()->*accessLayersFunction)();
-        FillLayer* prevChild = 0;
-        const FillLayer* currParent =
(styleResolver->parentStyle()->*layersFunction)();
-        while (currParent && (currParent->*testFunction)()) {
-            if (!currChild) {
-                /* Need to make a new layer.*/
-                currChild = new FillLayer(fillLayerType);
-                prevChild->setNext(currChild);
-            }
-            (currChild->*setFunction)((currParent->*getFunction)());
-            prevChild = currChild;
-            currChild = prevChild->next();
-            currParent = currParent->next();
-        }
-
-        while (currChild) {
-            /* Reset any remaining layers to not have the property set. */
-            (currChild->*clearFunction)();
-            currChild = currChild->next();
-        }
-    }
-
-    static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
-    {
-        FillLayer* currChild =
(styleResolver->style()->*accessLayersFunction)();
-        (currChild->*setFunction)((*initialFunction)(fillLayerType));
-        for (currChild = currChild->next(); currChild; currChild =
currChild->next())
-            (currChild->*clearFunction)();
-    }
-
-    static void applyValue(CSSPropertyID, StyleResolver* styleResolver,
CSSValue* value)
-    {
-        FillLayer* currChild =
(styleResolver->style()->*accessLayersFunction)();
-        FillLayer* prevChild = 0;
-        if (value->isValueList() && !value->isImageSetValue()) {
-            /* Walk each value and put it into a layer, creating new layers as
needed. */
-            CSSValueList* valueList = toCSSValueList(value);
-            for (unsigned int i = 0; i < valueList->length(); i++) {
-                if (!currChild) {
-                    /* Need to make a new layer to hold this value */
-                    currChild = new FillLayer(fillLayerType);
-                    prevChild->setNext(currChild);
-                }
-                (styleResolver->styleMap()->*mapFillFunction)(propertyId,
currChild, valueList->itemWithoutBoundsCheck(i));
-                prevChild = currChild;
-                currChild = currChild->next();
-            }
-        } else {
-            (styleResolver->styleMap()->*mapFillFunction)(propertyId,
currChild, value);
-            currChild = currChild->next();
-        }
-        while (currChild) {
-            /* Reset all remaining layers to not have the property set. */
-            (currChild->*clearFunction)();
-            currChild = currChild->next();
-        }
-    }
-
-    static PropertyHandler createHandler() { return
PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
 enum ComputeLengthNormal {NormalDisabled = 0, NormalEnabled};
 enum ComputeLengthThickness {ThicknessDisabled = 0, ThicknessEnabled};
 enum ComputeLengthSVGZoom {SVGZoomDisabled = 0, SVGZoomEnabled};
@@ -1821,18 +1683,6 @@ DeprecatedStyleBuilder::DeprecatedStyleBuilder()
         m_propertyMap[i] = PropertyHandler();
 
     // Please keep CSS property list in alphabetical order.
-    setPropertyHandler(CSSPropertyBackgroundAttachment,
ApplyPropertyFillLayer<EFillAttachment, CSSPropertyBackgroundAttachment,
BackgroundFillLayer, &RenderStyle::accessBackgroundLayers,
&RenderStyle::backgroundLayers, &FillLayer::isAttachmentSet,
&FillLayer::attachment, &FillLayer::setAttachment, &FillLayer::clearAttachment,
&FillLayer::initialFillAttachment,
&CSSToStyleMap::mapFillAttachment>::createHandler());
-    setPropertyHandler(CSSPropertyBackgroundBlendMode,
ApplyPropertyFillLayer<BlendMode, CSSPropertyBackgroundBlendMode,
BackgroundFillLayer, &RenderStyle::accessBackgroundLayers,
&RenderStyle::backgroundLayers, &FillLayer::isBlendModeSet,
&FillLayer::blendMode, &FillLayer::setBlendMode, &FillLayer::clearBlendMode,
&FillLayer::initialFillBlendMode,
&CSSToStyleMap::mapFillBlendMode>::createHandler());
-    setPropertyHandler(CSSPropertyBackgroundClip,
ApplyPropertyFillLayer<EFillBox, CSSPropertyBackgroundClip, BackgroundFillLayer,
&RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers,
&FillLayer::isClipSet, &FillLayer::clip, &FillLayer::setClip,
&FillLayer::clearClip, &FillLayer::initialFillClip,
&CSSToStyleMap::mapFillClip>::createHandler());
-    setPropertyHandler(CSSPropertyBackgroundColor,
ApplyPropertyColor<NoInheritFromParent, &RenderStyle::backgroundColor,
&RenderStyle::setBackgroundColor, &RenderStyle::setVisitedLinkBackgroundColor,
&RenderStyle::invalidColor>::createHandler());
-    setPropertyHandler(CSSPropertyBackgroundImage,
ApplyPropertyFillLayer<StyleImage*, CSSPropertyBackgroundImage,
BackgroundFillLayer, &RenderStyle::accessBackgroundLayers,
&RenderStyle::backgroundLayers, &FillLayer::isImageSet, &FillLayer::image,
&FillLayer::setImage, &FillLayer::clearImage, &FillLayer::initialFillImage,
&CSSToStyleMap::mapFillImage>::createHandler());
-    setPropertyHandler(CSSPropertyBackgroundOrigin,
ApplyPropertyFillLayer<EFillBox, CSSPropertyBackgroundOrigin,
BackgroundFillLayer, &Re…
(message too large)

[commit-bot: I haz the power, 2013-06-07 12:16:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/timloh@chromium.org/16530002/6001

[commit-bot: I haz the power, 2013-06-07 13:32:55]

Change committed as 152021