Move colorFromPrimitiveValue from StyleResolverState to TextLinkColors

Source/core/css/resolver/StyleResolverState.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 38 matching lines @@
     , m_styledElement(0)
     , m_parentNode(0)
     , m_parentStyle(0)
     , m_rootElementStyle(0)
     , m_regionForStyling(0)
     , m_elementLinkState(NotInsideLink)
     , m_distributedToInsertionPoint(false)
     , m_elementAffectedByClassRules(false)
     , m_applyPropertyToRegularStyle(true)
     , m_applyPropertyToVisitedLinkStyle(false)
-    , m_isMatchedPropertiesCacheable(true)
     , m_lineHeightValue(0)
     , m_fontDirty(false)
     , m_hasUAAppearance(false)
     , m_backgroundData(BackgroundFillLayer)
     , m_styleMap(*this)
     { }
 
 public:
     void initForStyleResolve(Document*, Element*, RenderStyle* parentStyle = 0, RenderRegion* regionForStyling = 0);
     void clear();
 
-    // FIXME: This function should live on TextLinkColors (or be passed a TextLinkColors),
-    // but it has dependencies that need to be untangled first.
-    // This method might change an internal state, i.e. m_isMatchedPropertiesCachable.
-    Color resolveColorFromPrimitiveValue(CSSPrimitiveValue*, bool forVisitedLink = false);
-
     Document* document() const { return m_element->document(); }
     Element* element() const { return m_element; }
     Element* styledElement() const { return m_styledElement; }
     void setStyle(PassRefPtr<RenderStyle> style) { m_style = style; }
     RenderStyle* style() const { return m_style.get(); }
     PassRefPtr<RenderStyle> takeStyle() { return m_style.release(); }
 
     const ContainerNode* parentNode() const { return m_parentNode; }
     void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = parentStyle; }
     RenderStyle* parentStyle() const { return m_parentStyle.get(); }
     RenderStyle* rootElementStyle() const { return m_rootElementStyle; }
 
     const RenderRegion* regionForStyling() const { return m_regionForStyling; }
     EInsideLink elementLinkState() const { return m_elementLinkState; }
     bool distributedToInsertionPoint() const { return m_distributedToInsertionPoint; }
     void setElementAffectedByClassRules(bool isAffected) { m_elementAffectedByClassRules = isAffected; }
     bool elementAffectedByClassRules() const { return m_elementAffectedByClassRules; }
 
     // FIXME: These are effectively side-channel "out parameters" for the various
     // map functions. When we map from CSS to style objects we use this state object
     // to track various meta-data about that mapping (e.g. if it's cache-able).
     // We need to move this data off of StyleResolverState and closer to the
     // objects it applies to. Possibly separating (immutable) inputs from (mutable) outputs.
     void setApplyPropertyToRegularStyle(bool isApply) { m_applyPropertyToRegularStyle = isApply; }
     void setApplyPropertyToVisitedLinkStyle(bool isApply) { m_applyPropertyToVisitedLinkStyle = isApply; }
     bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularStyle; }
     bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisitedLinkStyle; }
-    bool isMatchedPropertiesCacheable() const { return m_isMatchedPropertiesCacheable; }
 
     void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
     CSSValue* lineHeightValue() { return m_lineHeightValue; }
 
     void cacheBorderAndBackground();
     bool hasUAAppearance() const { return m_hasUAAppearance; }
     BorderData borderData() const { return m_borderData; }
     FillLayer backgroundData() const { return m_backgroundData; }
     Color backgroundColor() const { return m_backgroundColor; }
     ElementStyleResources& elementStyleResources() { return m_elementStyleResources; }
@@ skipping 46 matching lines @@
     RenderRegion* m_regionForStyling;
 
     EInsideLink m_elementLinkState;
 
     bool m_distributedToInsertionPoint;
 
     bool m_elementAffectedByClassRules;
 
     bool m_applyPropertyToRegularStyle;
     bool m_applyPropertyToVisitedLinkStyle;
-    bool m_isMatchedPropertiesCacheable;
 
     CSSValue* m_lineHeightValue;
     bool m_fontDirty;
 
     bool m_hasUAAppearance;
     BorderData m_borderData;
     FillLayer m_backgroundData;
     Color m_backgroundColor;
     ElementStyleResources m_elementStyleResources;
     // CSSToStyleMap is a pure-logic class and only contains
     // a back-pointer to this object.
     CSSToStyleMap m_styleMap;
 };
 
 } // namespace WebCore
 
 #endif // StyleResolverState_h