Move custom property isInheritedProperty storage logic into ComputedStyle

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. 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.
@@ skipping 1808 matching lines @@
     PassRefPtr<CSSVariableData> value,
     const CSSValue* parsedValue) {
   DCHECK(!!value == !!parsedValue);
   DCHECK(!(value && value->needsVariableResolution()));
 
   StyleNonInheritedVariables& variables = mutableNonInheritedVariables();
   variables.setVariable(name, std::move(value));
   variables.setRegisteredVariable(name, parsedValue);
 }
 
-void ComputedStyle::removeInheritedVariable(const AtomicString& name) {
-  mutableInheritedVariables().removeVariable(name);
-}
-
-void ComputedStyle::removeNonInheritedVariable(const AtomicString& name) {
-  mutableNonInheritedVariables().removeVariable(name);
+void ComputedStyle::removeVariable(const AtomicString& name,
+                                   bool isInheritedProperty) {
+  if (isInheritedProperty) {
+    mutableInheritedVariables().removeVariable(name);
+  } else {
+    mutableNonInheritedVariables().removeVariable(name);
+  }
 }
 
 CSSVariableData* ComputedStyle::getVariable(const AtomicString& name) const {
-  if (inheritedVariables()) {
-    if (CSSVariableData* variable = inheritedVariables()->getVariable(name))
-      return variable;
+  CSSVariableData* variable = getVariable(name, true);
+  if (variable) {
+    return variable;
   }
-  if (nonInheritedVariables()) {
-    if (CSSVariableData* variable = nonInheritedVariables()->getVariable(name))
-      return variable;
+  return getVariable(name, false);
+}
+
+CSSVariableData* ComputedStyle::getVariable(const AtomicString& name,
+                                            bool isInheritedProperty) const {
+  if (isInheritedProperty) {
+    return inheritedVariables() ? inheritedVariables()->getVariable(name)
+                                : nullptr;
   }
-  return nullptr;
+  return nonInheritedVariables() ? nonInheritedVariables()->getVariable(name)
+                                 : nullptr;
+}
+
+const CSSValue* ComputedStyle::getRegisteredVariable(
+    const AtomicString& name,
+    bool isInheritedProperty) const {
+  if (isInheritedProperty) {
+    return inheritedVariables() ? inheritedVariables()->registeredVariable(name)
+                                : nullptr;
+  }
+  return nonInheritedVariables()
+             ? nonInheritedVariables()->registeredVariable(name)
+             : nullptr;
 }
 
 float ComputedStyle::wordSpacing() const {
   return getFontDescription().wordSpacing();
 }
 float ComputedStyle::letterSpacing() const {
   return getFontDescription().letterSpacing();
 }
 
 bool ComputedStyle::setFontDescription(const FontDescription& v) {
@@ skipping 604 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink