Clean up ComputedStyleCSSValueMapping after change to ComputedStyle::getVariable()

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1930 matching lines @@
 }
 
 const CSSValue* ComputedStyleCSSValueMapping::get(
     const AtomicString customPropertyName,
     const ComputedStyle& style,
     const PropertyRegistry* registry) {
   if (registry) {
     const PropertyRegistry::Registration* registration =
         registry->registration(customPropertyName);
     if (registration) {
-      const CSSValue* result = nullptr;
-      if (registration->inherits()) {
-        if (StyleInheritedVariables* variables = style.inheritedVariables())
-          result = variables->registeredVariable(customPropertyName);
-      } else {
-        if (StyleNonInheritedVariables* variables =
-                style.nonInheritedVariables())
-          result = variables->registeredVariable(customPropertyName);
-      }
+      const CSSValue* result = style.getRegisteredVariable(
+          customPropertyName, registration->inherits());
       if (result)
         return result;
       return registration->initial();
     }
   }
 
-  StyleInheritedVariables* variables = style.inheritedVariables();
-  if (!variables)
-    return nullptr;
-
-  CSSVariableData* data = variables->getVariable(customPropertyName);
+  bool isInheritedProperty = true;
+  CSSVariableData* data =
+      style.getVariable(customPropertyName, isInheritedProperty);
   if (!data)
     return nullptr;
 
   return CSSCustomPropertyDeclaration::create(customPropertyName, data);
 }
 
 std::unique_ptr<HashMap<AtomicString, RefPtr<CSSVariableData>>>
 ComputedStyleCSSValueMapping::getVariables(const ComputedStyle& style) {
   // TODO(timloh): Also return non-inherited variables
   StyleInheritedVariables* variables = style.inheritedVariables();
@@ skipping 1669 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 }  // namespace blink