Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1768)

Unified Diff: third_party/WebKit/Source/core/css/CSSFontFaceSource.h

Issue 1973153004: Fix FontCacheKey-keyed HashMap usage in core/css (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +comment Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/core.gypi ('k') | third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « third_party/WebKit/Source/core/core.gypi ('k') | third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698