am 3c54ece0: am 5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp

[android-x86/external-webkit.git] / WebCore / css / CSSVariablesDeclaration.h

diff --git a/WebCore/css/CSSVariablesDeclaration.h b/WebCore/css/CSSVariablesDeclaration.h
index 5357bf0..f16b011 100644 (file)
--- a/WebCore/css/CSSVariablesDeclaration.h
+++ b/WebCore/css/CSSVariablesDeclaration.h
@@ -39,11 +39,12 @@ typedef int ExceptionCode;
 
 class CSSMutableStyleDeclaration;
 class CSSRule;
+class CSSValue;
 class CSSValueList;
 
 class CSSVariablesDeclaration : public StyleBase {
 public:
-    static PassRefPtr<CSSVariablesDeclaration> create(StyleBase* owningRule, const Vector<String>& names, const Vector<RefPtr<StyleBase> >& values)
+    static PassRefPtr<CSSVariablesDeclaration> create(StyleBase* owningRule, const Vector<String>& names, const Vector<RefPtr<CSSValue> >& values)
     {
         return adoptRef(new CSSVariablesDeclaration(owningRule, names, values));
     }
@@ -61,19 +62,19 @@ public:
     String cssText() const;
     void setCssText(const String&); // FIXME: The spec contradicts itself regarding whether or not cssText is settable.
 
-    void addParsedVariable(const String& variableName, PassRefPtr<StyleBase> variableValue, bool updateNamesList = true);
+    void addParsedVariable(const String& variableName, PassRefPtr<CSSValue> variableValue, bool updateNamesList = true);
     
     CSSValueList* getParsedVariable(const String& variableName);
     CSSMutableStyleDeclaration* getParsedVariableDeclarationBlock(const String& variableName);
 
 private:
-    CSSVariablesDeclaration(StyleBase* owningRule, const Vector<String>& names, const Vector<RefPtr<StyleBase> >& values);
+    CSSVariablesDeclaration(StyleBase* owningRule, const Vector<String>& names, const Vector<RefPtr<CSSValue> >& values);
 
-    void setChanged();
+    void setNeedsStyleRecalc();
 
 protected:
     Vector<String> m_variableNames;
-    HashMap<String, RefPtr<StyleBase> > m_variablesMap;
+    HashMap<String, RefPtr<CSSValue> > m_variablesMap;
 };
 
 } // namespace WebCore