Change CSSCustomPropertyDeclaration::id() to isInherit() and isInitial()

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * 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.
@@ skipping 787 matching lines @@
 
 void StyleBuilderFunctions::applyValueCSSPropertyVariable(StyleResolverState& state, const CSSValue& value)
 {
     const CSSCustomPropertyDeclaration& declaration = toCSSCustomPropertyDeclaration(value);
     const AtomicString& name = declaration.name();
     const PropertyRegistry::Registration* registration = nullptr;
     const PropertyRegistry* registry = state.document().propertyRegistry();
     if (registry)
         registration = registry->registration(name);
 
-    bool initial = declaration.id() == CSSValueInitial
-        || (declaration.id() == CSSValueUnset && registration && !registration->inherits());
-    bool inherit = declaration.id() == CSSValueInherit
-        || (declaration.id() == CSSValueUnset && (!registration || registration->inherits()));
+    bool isInheritedProperty = !registration || registration->inherits();
+    bool initial = declaration.isInitial(isInheritedProperty);
+    bool inherit = declaration.isInherit(isInheritedProperty);
     DCHECK(!(initial && inherit));
 
-    if (declaration.id() == CSSValueInternalVariableValue) {
+    if (!initial && !inherit) {
         if (declaration.value()->needsVariableResolution()) {
-            if (!registration || registration->inherits())
+            if (isInheritedProperty)
                 state.style()->setUnresolvedInheritedVariable(name, declaration.value());
             else
                 state.style()->setUnresolvedNonInheritedVariable(name, declaration.value());
             return;
         }
 
         if (!registration) {
             state.style()->setResolvedUnregisteredVariable(name, declaration.value());
             return;
         }
 
         const CSSValue* parsedValue = declaration.value()->parseForSyntax(registration->syntax());
         if (parsedValue) {
             parsedValue = &StyleBuilderConverter::convertRegisteredPropertyValue(state, *parsedValue);
             DCHECK(parsedValue);
-            if (registration->inherits())
+            if (isInheritedProperty)
                 state.style()->setResolvedInheritedVariable(name, declaration.value(), parsedValue);
             else
                 state.style()->setResolvedNonInheritedVariable(name, declaration.value(), parsedValue);
             return;
         }
-        if (registration->inherits())
+        if (isInheritedProperty)
             inherit = true;
         else
             initial = true;
     }
 
     DCHECK(initial ^ inherit);
 
     if (initial) {
-        if (!registration || registration->inherits())
+        if (isInheritedProperty)
             state.style()->removeInheritedVariable(name);
         else
             state.style()->removeNonInheritedVariable(name);
         return;
     }
 
-    if (!registration || registration->inherits()) {
+    if (isInheritedProperty) {
         state.style()->removeInheritedVariable(name);
         StyleInheritedVariables* parentVariables = state.parentStyle()->inheritedVariables();
         if (!parentVariables)
             return;
         CSSVariableData* parentValue = parentVariables->getVariable(name);
         if (parentValue) {
             if (!registration)
                 state.style()->setResolvedUnregisteredVariable(name, parentValue);
             else
                 state.style()->setResolvedInheritedVariable(name, parentValue, parentVariables->registeredVariable(name));
@@ skipping 45 matching lines @@
     }
 }
 
 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState& state)
 {
     if (!state.parentNode()->isDocumentNode())
         state.style()->setPosition(state.parentStyle()->position());
 }
 
 } // namespace blink