CSS Properties and Values API: Support non-inherited custom properties

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
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 45 matching lines @@
 #include "core/css/PropertyRegistry.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutGrid.h"
 #include "core/layout/LayoutObject.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/ContentData.h"
 #include "core/style/CursorData.h"
 #include "core/style/QuotesData.h"
 #include "core/style/ShadowList.h"
-#include "core/style/StyleVariableData.h"
+#include "core/style/StyleInheritedVariables.h"
+#include "core/style/StyleNonInheritedVariables.h"
 #include "platform/LengthFunctions.h"
 
 namespace blink {
 
 inline static bool isFlexOrGrid(const ComputedStyle* style)
 {
     return style && style->isDisplayFlexibleOrGridBox();
 }
 
 inline static CSSPrimitiveValue* zoomAdjustedPixelValue(double value, const ComputedStyle& style)
@@ skipping 1564 matching lines @@
         return BreakAlways;
     case BreakAvoidColumn:
         return BreakAvoid;
     default:
         return genericBreakValue;
     }
 }
 
 const CSSValue* ComputedStyleCSSValueMapping::get(const AtomicString customPropertyName, const ComputedStyle& style, const PropertyRegistry* registry)
 {
-    StyleVariableData* variables = style.variables();
     if (registry) {
         const PropertyRegistry::Registration* registration = registry->registration(customPropertyName);
         if (registration) {
-            if (variables) {
-                const CSSValue* result = variables->registeredInheritedProperty(customPropertyName);
-                if (result)
-                    return result;
+            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);
             }
+            if (result)
+                return result;
             return registration->initial();
         }
     }
 
+    StyleInheritedVariables* variables = style.inheritedVariables();
     if (!variables)
         return nullptr;
 
     CSSVariableData* data = variables->getVariable(customPropertyName);
     if (!data)
         return nullptr;
 
     return CSSCustomPropertyDeclaration::create(customPropertyName, data);
 }
 
 std::unique_ptr<HashMap<AtomicString, RefPtr<CSSVariableData>>> ComputedStyleCSSValueMapping::getVariables(const ComputedStyle& style)
 {
-    StyleVariableData* variables = style.variables();
+    // TODO(timloh): Also return non-inherited variables
+    StyleInheritedVariables* variables = style.inheritedVariables();
     if (variables)
         return variables->getVariables();
     return nullptr;
 }
 
 const CSSValue* ComputedStyleCSSValueMapping::get(CSSPropertyID propertyID, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
 {
     const SVGComputedStyle& svgStyle = style.svgStyle();
     propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style.direction(), style.getWritingMode());
     switch (propertyID) {
@@ skipping 1350 matching lines @@
     case CSSPropertyAll:
         return nullptr;
     default:
         break;
     }
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 } // namespace blink