From 6b70adc33054f8aee8c54d0f460458a9df11b8a5 Mon Sep 17 00:00:00 2001
From: Russell Brenner <russellbrenner@google.com>
Date: Thu, 18 Nov 2010 17:33:13 -0800
Subject: Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
---
 WebCore/css/CSSStyleSelector.h | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'WebCore/css/CSSStyleSelector.h')

diff --git a/WebCore/css/CSSStyleSelector.h b/WebCore/css/CSSStyleSelector.h
index 20cd866..b718751 100644
--- a/WebCore/css/CSSStyleSelector.h
+++ b/WebCore/css/CSSStyleSelector.h
@@ -50,8 +50,6 @@ class CSSSelector;
 class CSSStyleRule;
 class CSSStyleSheet;
 class CSSValue;
-class CSSVariableDependentValue;
-class CSSVariablesRule;
 class ContainerNode;
 class DataGridColumn;
 class Document;
@@ -165,10 +163,6 @@ public:
         void allVisitedStateChanged() { m_checker.allVisitedStateChanged(); }
         void visitedStateChanged(LinkHash visitedHash) { m_checker.visitedStateChanged(visitedHash); }
 
-        void addVariables(CSSVariablesRule* variables);
-        CSSValue* resolveVariableDependentValue(CSSVariableDependentValue*);
-        void resolveVariablesForDeclaration(CSSMutableStyleDeclaration* decl, CSSMutableStyleDeclaration* newDecl, HashSet<String>& usedBlockVariables);
-
         void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule> rule);
         void addPageStyle(PassRefPtr<CSSPageRule>);
 
@@ -319,9 +313,6 @@ public:
         HashSet<AtomicStringImpl*> m_selectorAttrs;
         Vector<CSSMutableStyleDeclaration*> m_additionalAttributeStyleDecls;
         Vector<MediaQueryResult*> m_viewportDependentMediaQueryResults;
-        
-        HashMap<String, CSSVariablesRule*> m_variablesMap;
-        HashMap<CSSMutableStyleDeclaration*, RefPtr<CSSMutableStyleDeclaration> > m_resolvedVariablesDeclarations;
     };
 
     class CSSRuleData : public Noncopyable {
-- 
cgit v1.1