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

third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 68 matching lines @@
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/html/HTMLSlotElement.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/GeneratedChildren.h"
 #include "core/layout/api/LayoutViewItem.h"
-#include "core/style/StyleVariableData.h"
+#include "core/style/StyleInheritedVariables.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGElement.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/StdLibExtras.h"
 
 namespace {
 
 using namespace blink;
 
 void setAnimationUpdateIfNeeded(StyleResolverState& state, Element& element)
 {
     // If any changes to CSS Animations were detected, stash the update away for application after the
     // layout object is updated if we're in the appropriate scope.
     if (!state.animationUpdate().isEmpty())
         element.ensureElementAnimations().cssAnimations().setPendingUpdate(state.animationUpdate());
 }
 
 // Returns whether any @apply rule sets a custom property
 bool cacheCustomPropertiesForApplyAtRules(StyleResolverState& state, const MatchedPropertiesRange& range)
 {
     bool ruleSetsCustomProperty = false;
-    if (!state.style()->variables())
+    // TODO(timloh): @apply should also work with properties registered as non-inherited.
+    if (!state.style()->inheritedVariables())
         return false;
     for (const auto& matchedProperties : range) {
         const StylePropertySet& properties = *matchedProperties.properties;
         unsigned propertyCount = properties.propertyCount();
         for (unsigned i = 0; i < propertyCount; ++i) {
             StylePropertySet::PropertyReference current = properties.propertyAt(i);
             if (current.id() != CSSPropertyApplyAtRule)
                 continue;
             AtomicString name(toCSSCustomIdentValue(current.value()).value());
-            CSSVariableData* variableData = state.style()->variables()->getVariable(name);
+            CSSVariableData* variableData = state.style()->inheritedVariables()->getVariable(name);
             if (!variableData)
                 continue;
             StylePropertySet* customPropertySet = variableData->propertySet();
             if (!customPropertySet)
                 continue;
             if (customPropertySet->findPropertyIndex(CSSPropertyVariable) != -1)
                 ruleSetsCustomProperty = true;
             state.setCustomPropertySetForApplyAtRule(name, customPropertySet);
         }
     }
@@ skipping 1295 matching lines @@
             continue;
 
         StyleBuilder::applyProperty(propertyId, state, allValue);
     }
 }
 
 template <CSSPropertyPriority priority>
 void StyleResolver::applyPropertiesForApplyAtRule(StyleResolverState& state, const CSSValue& value, bool isImportant, PropertyWhitelistType propertyWhitelistType)
 {
     state.style()->setHasVariableReferenceFromNonInheritedProperty();
-    if (!state.style()->variables())
+    if (!state.style()->inheritedVariables())
         return;
     const String& name = toCSSCustomIdentValue(value).value();
     const StylePropertySet* propertySet = state.customPropertySetForApplyAtRule(name);
     bool inheritedOnly = false;
     if (propertySet)
         applyProperties<priority>(state, propertySet, isImportant, inheritedOnly, propertyWhitelistType);
 }
 
 template <CSSPropertyPriority priority>
 void StyleResolver::applyProperties(StyleResolverState& state, const StylePropertySet* properties, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType)
@@ skipping 296 matching lines @@
     visitor->trace(m_siblingRuleSet);
     visitor->trace(m_uncommonAttributeRuleSet);
     visitor->trace(m_watchedSelectorsRules);
     visitor->trace(m_treeBoundaryCrossingScopes);
     visitor->trace(m_styleSharingLists);
     visitor->trace(m_pendingStyleSheets);
     visitor->trace(m_document);
 }
 
 } // namespace blink