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

third_party/WebKit/Source/core/css/CSSCustomPropertyDeclaration.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CSSCustomPropertyDeclaration_h
 #define CSSCustomPropertyDeclaration_h
 
 #include "core/css/CSSValue.h"
 #include "core/css/CSSVariableData.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/AtomicString.h"
 
 namespace blink {
 
 class CSSCustomPropertyDeclaration : public CSSValue {
 public:
     static CSSCustomPropertyDeclaration* create(const AtomicString& name, PassRefPtr<CSSVariableData> value)
     {
         return new CSSCustomPropertyDeclaration(name, std::move(value));
     }
 
     static CSSCustomPropertyDeclaration* create(const AtomicString& name, CSSValueID id)
     {
         return new CSSCustomPropertyDeclaration(name, id);
     }
 
     const AtomicString& name() const { return m_name; }
     CSSVariableData* value() const { return m_value.get(); }
-    CSSValueID id() const { return m_valueId; }
+
+    bool isInherit(bool isInheritedProperty) const { return m_valueId == CSSValueInherit || (isInheritedProperty && m_valueId == CSSValueUnset); }
+    bool isInitial(bool isInheritedProperty) const { return m_valueId == CSSValueInitial || (!isInheritedProperty && m_valueId == CSSValueUnset); }
+
     String customCSSText() const;
 
     bool equals(const CSSCustomPropertyDeclaration& other) const { return this == &other; }
 
     DECLARE_TRACE_AFTER_DISPATCH();
 private:
     CSSCustomPropertyDeclaration(const AtomicString& name, CSSValueID id)
         : CSSValue(CustomPropertyDeclarationClass)
         , m_name(name)
         , m_value(nullptr)
         , m_valueId(id)
     {
         ASSERT(id == CSSValueInherit || id == CSSValueInitial || id == CSSValueUnset);
     }
 
     CSSCustomPropertyDeclaration(const AtomicString& name, PassRefPtr<CSSVariableData> value)
         : CSSValue(CustomPropertyDeclarationClass)
         , m_name(name)
         , m_value(value)
-        , m_valueId(CSSValueInternalVariableValue)
+        , m_valueId(CSSValueInvalid)
     {
     }
 
     const AtomicString m_name;
     RefPtr<CSSVariableData> m_value;
     CSSValueID m_valueId;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCustomPropertyDeclaration, isCustomPropertyDeclaration());
 
 } // namespace blink
 
 #endif // CSSCustomPropertyDeclaration_h