Chromium Code Reviews| 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 7dbcf6c0336412f4c6d68cac26190c365669a290..7b70c7e5df830c4165389b24690f1308ef646eb7 100644 |
| --- a/third_party/WebKit/Source/core/css/CSSValuePool.h |
| +++ b/third_party/WebKit/Source/core/css/CSSValuePool.h |
| @@ -31,6 +31,7 @@ |
| #include "core/CoreExport.h" |
| #include "core/css/CSSColorValue.h" |
| #include "core/css/CSSCustomIdentValue.h" |
| +#include "core/css/CSSFontFamilyValue.h" |
|
Timothy Loh
2016/03/14 23:25:11
can this be a forwards declaration? otherwise you'
rwlbuis
2016/03/15 18:34:15
Not possible unfortunately, but I removed the incl
|
| #include "core/css/CSSInheritedValue.h" |
| #include "core/css/CSSInitialValue.h" |
| #include "core/css/CSSPrimitiveValue.h" |
| @@ -46,7 +47,7 @@ class CORE_EXPORT CSSValuePool : public NoBaseWillBeGarbageCollectedFinalized<C |
| USING_FAST_MALLOC_WILL_BE_REMOVED(CSSValuePool); |
| public: |
| PassRefPtrWillBeRawPtr<CSSValueList> createFontFaceValue(const AtomicString&); |
| - PassRefPtrWillBeRawPtr<CSSCustomIdentValue> createFontFamilyValue(const String&); |
| + PassRefPtrWillBeRawPtr<CSSFontFamilyValue> createFontFamilyValue(const String&); |
| PassRefPtrWillBeRawPtr<CSSInheritedValue> createInheritedValue() { return m_inheritedValue; } |
| PassRefPtrWillBeRawPtr<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue; } |
| PassRefPtrWillBeRawPtr<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue; } |
| @@ -86,7 +87,7 @@ private: |
| using FontFaceValueCache = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<CSSValueList>>; |
| FontFaceValueCache m_fontFaceValueCache; |
| - using FontFamilyValueCache = WillBeHeapHashMap<String, RefPtrWillBeMember<CSSCustomIdentValue>>; |
| + using FontFamilyValueCache = WillBeHeapHashMap<String, RefPtrWillBeMember<CSSFontFamilyValue>>; |
| FontFamilyValueCache m_fontFamilyValueCache; |
| friend CORE_EXPORT CSSValuePool& cssValuePool(); |