| Index: third_party/WebKit/Source/core/css/CSSValue.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSValue.h b/third_party/WebKit/Source/core/css/CSSValue.h
|
| index 011851b7ef8889ebb6b79d8062cace2c615f47b4..5b4481ca33cb0384950a19079280f80e45dfe5e1 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSValue.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSValue.h
|
| @@ -75,9 +75,9 @@ public:
|
| bool isGradientValue() const { return m_classType >= LinearGradientClass && m_classType <= RadialGradientClass; }
|
| bool isImageSetValue() const { return m_classType == ImageSetClass; }
|
| bool isImageValue() const { return m_classType == ImageClass; }
|
| - bool isImplicitInitialValue() const;
|
| + bool isImplicit() const { return m_implicit; }
|
| bool isInheritedValue() const { return m_classType == InheritedClass; }
|
| - bool isInitialValue() const { return m_classType == InitialClass; }
|
| + bool isInitialValue() const { return m_classType == InitialClass || m_implicit; }
|
| bool isUnsetValue() const { return m_classType == UnsetClass; }
|
| bool isCSSWideKeyword() const { return m_classType >= InheritedClass && m_classType <= UnsetClass; }
|
| bool isLinearGradientValue() const { return m_classType == LinearGradientClass; }
|
| @@ -101,6 +101,8 @@ public:
|
|
|
| bool hasFailedOrCanceledSubresources() const;
|
|
|
| + void setImplicit() { m_implicit = true; }
|
| +
|
| bool equals(const CSSValue&) const;
|
|
|
| void finalizeGarbageCollectedObject();
|
| @@ -188,6 +190,7 @@ protected:
|
| explicit CSSValue(ClassType classType)
|
| : m_primitiveUnitType(0)
|
| , m_hasCachedCSSText(false)
|
| + , m_implicit(false)
|
| , m_valueListSeparator(SpaceSeparator)
|
| , m_classType(classType)
|
| {
|
| @@ -203,6 +206,7 @@ protected:
|
| // CSSPrimitiveValue bits:
|
| unsigned m_primitiveUnitType : 7; // CSSPrimitiveValue::UnitType
|
| mutable unsigned m_hasCachedCSSText : 1;
|
| + mutable unsigned m_implicit : 1;
|
|
|
| unsigned m_valueListSeparator : ValueListSeparatorBits;
|
|
|
|
|