| Index: third_party/WebKit/Source/core/css/CSSValuePool.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSValuePool.h b/third_party/WebKit/Source/core/css/CSSValuePool.h
|
| index 46a823349bf3616943c3a32205b5440353e166a2..63e7916d3e371da15830dc2cf1c9f1e648172037 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSValuePool.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSValuePool.h
|
| @@ -59,8 +59,7 @@ public:
|
| CSSColorValue* whiteColor() { return m_colorWhite; }
|
| CSSColorValue* blackColor() { return m_colorBlack; }
|
| CSSInheritedValue* inheritedValue() { return m_inheritedValue; }
|
| - CSSInitialValue* implicitInitialValue() { return m_implicitInitialValue; }
|
| - CSSInitialValue* explicitInitialValue() { return m_explicitInitialValue; }
|
| + CSSInitialValue* initialValue() { return m_initialValue; }
|
| CSSUnsetValue* unsetValue() { return m_unsetValue; }
|
|
|
| // CSSPrimitiveValue vector caches.
|
| @@ -100,8 +99,7 @@ private:
|
|
|
| // Cached individual values.
|
| Member<CSSInheritedValue> m_inheritedValue;
|
| - Member<CSSInitialValue> m_implicitInitialValue;
|
| - Member<CSSInitialValue> m_explicitInitialValue;
|
| + Member<CSSInitialValue> m_initialValue;
|
| Member<CSSUnsetValue> m_unsetValue;
|
| Member<CSSColorValue> m_colorTransparent;
|
| Member<CSSColorValue> m_colorWhite;
|
|
|