| Index: third_party/WebKit/Source/core/css/CSSFontFaceSource.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSource.h b/third_party/WebKit/Source/core/css/CSSFontFaceSource.h
|
| index 20a1f6f2c1860275f208c358a59f2880468fe8f0..a0cfdde0c0766b661f1ac49b55811054153e515c 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSFontFaceSource.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSFontFaceSource.h
|
| @@ -26,6 +26,8 @@
|
| #ifndef CSSFontFaceSource_h
|
| #define CSSFontFaceSource_h
|
|
|
| +#include "core/CoreExport.h"
|
| +#include "platform/fonts/FontCacheKey.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/Allocator.h"
|
| #include "wtf/HashMap.h"
|
| @@ -36,7 +38,7 @@ class CSSFontFace;
|
| class FontDescription;
|
| class SimpleFontData;
|
|
|
| -class CSSFontFaceSource : public GarbageCollectedFinalized<CSSFontFaceSource> {
|
| +class CORE_EXPORT CSSFontFaceSource : public GarbageCollectedFinalized<CSSFontFaceSource> {
|
| WTF_MAKE_NONCOPYABLE(CSSFontFaceSource);
|
| public:
|
| virtual ~CSSFontFaceSource();
|
| @@ -62,7 +64,7 @@ protected:
|
| CSSFontFaceSource();
|
| virtual PassRefPtr<SimpleFontData> createFontData(const FontDescription&) = 0;
|
|
|
| - using FontDataTable = HashMap<unsigned, RefPtr<SimpleFontData>>; // The hash key is composed of size synthetic styles.
|
| + using FontDataTable = HashMap<FontCacheKey, RefPtr<SimpleFontData>, FontCacheKeyHash, FontCacheKeyTraits>;
|
|
|
| Member<CSSFontFace> m_face; // Our owning font face.
|
| FontDataTable m_fontDataTable;
|
|
|