| 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 217b0cbe4f145c04e94282aae89596b51308b7f6..cc6abb983d3b0cb3a73f2811d31e97cb6711403d 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSValuePool.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSValuePool.h
|
| @@ -63,8 +63,7 @@ class CORE_EXPORT CSSValuePool
|
| 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; }
|
|
|
| // Vector caches.
|
| @@ -123,8 +122,7 @@ class CORE_EXPORT CSSValuePool
|
|
|
| // 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;
|
|
|