Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / CSSComputedStyleDeclaration.h

diff --git a/src/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.h b/src/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.h
index e4b0bac..04793a4 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.h
+++ b/src/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.h
@@ -48,23 +48,6 @@ class StylePropertyShorthand;
 enum EUpdateLayout { DoNotUpdateLayout = false, UpdateLayout = true };
 
 class CSSComputedStyleDeclaration FINAL : public CSSStyleDeclaration {
-private:
-    class ComputedCSSVariablesIterator FINAL : public CSSVariablesIterator {
-    public:
-        virtual ~ComputedCSSVariablesIterator() { }
-        static PassRefPtr<ComputedCSSVariablesIterator> create(const HashMap<AtomicString, String>* variableMap) { return adoptRef(new ComputedCSSVariablesIterator(variableMap)); }
-    private:
-        explicit ComputedCSSVariablesIterator(const HashMap<AtomicString, String>* variableMap);
-        virtual void advance() OVERRIDE;
-        virtual bool atEnd() const OVERRIDE { return m_it == m_end; }
-        virtual AtomicString name() const OVERRIDE;
-        virtual String value() const OVERRIDE;
-        bool m_active;
-        typedef HashMap<AtomicString, String>::const_iterator VariablesMapIterator;
-        VariablesMapIterator m_it;
-        VariablesMapIterator m_end;
-    };
-
 public:
     static PassRefPtr<CSSComputedStyleDeclaration> create(PassRefPtr<Node> node, bool allowVisitedStyle = false, const String& pseudoElementName = String())
     {
@@ -116,27 +99,19 @@ private:
     virtual String getPropertyValueInternal(CSSPropertyID) OVERRIDE;
     virtual void setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionState&) OVERRIDE;
 
-    const HashMap<AtomicString, String>* variableMap() const;
-    virtual unsigned variableCount() const OVERRIDE;
-    virtual String variableValue(const AtomicString& name) const OVERRIDE;
-    virtual bool setVariableValue(const AtomicString& name, const String& value, ExceptionState&) OVERRIDE;
-    virtual bool removeVariable(const AtomicString& name) OVERRIDE;
-    virtual bool clearVariables(ExceptionState&) OVERRIDE;
-    virtual PassRefPtr<CSSVariablesIterator> variablesIterator() const OVERRIDE { return ComputedCSSVariablesIterator::create(variableMap()); }
-
     virtual bool cssPropertyMatches(CSSPropertyID, const CSSValue*) const OVERRIDE;
 
     PassRefPtr<CSSValue> valueForShadowData(const ShadowData&, const RenderStyle&, bool useSpread) const;
     PassRefPtr<CSSValue> valueForShadowList(const ShadowList*, const RenderStyle&, bool useSpread) const;
-    PassRefPtr<CSSPrimitiveValue> currentColorOrValidColor(const RenderStyle&, const StyleColor&) const;
-    PassRefPtr<SVGPaint> adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint>, RenderStyle&) const;
+    PassRefPtrWillBeRawPtr<CSSPrimitiveValue> currentColorOrValidColor(const RenderStyle&, const StyleColor&) const;
+    PassRefPtrWillBeRawPtr<SVGPaint> adjustSVGPaintForCurrentColor(PassRefPtrWillBeRawPtr<SVGPaint>, RenderStyle&) const;
 
     PassRefPtr<CSSValue> valueForFilter(const RenderObject*, const RenderStyle&) const;
 
-    PassRefPtr<CSSValueList> valuesForShorthandProperty(const StylePropertyShorthand&) const;
-    PassRefPtr<CSSValueList> valuesForSidesShorthand(const StylePropertyShorthand&) const;
-    PassRefPtr<CSSValueList> valuesForBackgroundShorthand() const;
-    PassRefPtr<CSSValueList> valuesForGridShorthand(const StylePropertyShorthand&) const;
+    PassRefPtrWillBeRawPtr<CSSValueList> valuesForShorthandProperty(const StylePropertyShorthand&) const;
+    PassRefPtrWillBeRawPtr<CSSValueList> valuesForSidesShorthand(const StylePropertyShorthand&) const;
+    PassRefPtrWillBeRawPtr<CSSValueList> valuesForBackgroundShorthand() const;
+    PassRefPtrWillBeRawPtr<CSSValueList> valuesForGridShorthand(const StylePropertyShorthand&) const;
 
     RefPtr<Node> m_node;
     PseudoId m_pseudoElementSpecifier;