Move custom property isInheritedProperty storage logic into ComputedStyle

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 2486 matching lines @@
 
   void setResolvedUnregisteredVariable(const AtomicString&,
                                        PassRefPtr<CSSVariableData>);
   void setResolvedInheritedVariable(const AtomicString&,
                                     PassRefPtr<CSSVariableData>,
                                     const CSSValue*);
   void setResolvedNonInheritedVariable(const AtomicString&,
                                        PassRefPtr<CSSVariableData>,
                                        const CSSValue*);
 
-  void removeInheritedVariable(const AtomicString&);
-  void removeNonInheritedVariable(const AtomicString&);
+  void removeVariable(const AtomicString&, bool isInheritedProperty);
 
   // Handles both inherited and non-inherited variables
   CSSVariableData* getVariable(const AtomicString&) const;
 
+  CSSVariableData* getVariable(const AtomicString&,
+                               bool isInheritedProperty) const;
+
+  const CSSValue* getRegisteredVariable(const AtomicString&,
+                                        bool isInheritedProperty) const;
+
   void setHasVariableReferenceFromNonInheritedProperty() {
     m_nonInheritedData.m_variableReference = true;
   }
   bool hasVariableReferenceFromNonInheritedProperty() const {
     return m_nonInheritedData.m_variableReference;
   }
 
   // Animations.
   CSSAnimationData& accessAnimations();
   const CSSAnimationData* animations() const {
@@ skipping 1404 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h