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

Unified Diff: Source/platform/fonts/FontCache.h

Issue 235553003: Support sideloaded fonts for DirectWrite (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add ForTesting, iterator name Created 6 years, 8 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 | « no previous file | Source/platform/fonts/skia/FontCacheSkia.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/FontCache.h
diff --git a/Source/platform/fonts/FontCache.h b/Source/platform/fonts/FontCache.h
index 50ad4818f3c3faf1a43a222f63d2b77f31d6e204..19f8a49085b4ae6e85b8e7af70d2ebf3ad860e99 100644
--- a/Source/platform/fonts/FontCache.h
+++ b/Source/platform/fonts/FontCache.h
@@ -33,6 +33,7 @@
#include <limits.h>
#include "platform/PlatformExport.h"
#include "wtf/Forward.h"
+#include "wtf/HashMap.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefPtr.h"
#include "wtf/Vector.h"
@@ -105,6 +106,7 @@ public:
static void setUseDirectWrite(bool useDirectWrite) { s_useDirectWrite = useDirectWrite; }
static void setDirectWriteFactory(IDWriteFactory* factory) { s_directWriteFactory = factory; }
static void setUseSubpixelPositioning(bool useSubpixelPositioning) { s_useSubpixelPositioning = useSubpixelPositioning; }
+ static void addSideloadedFontForTesting(SkTypeface*);
#endif
#if ENABLE(OPENTYPE_VERTICAL)
@@ -156,6 +158,7 @@ private:
static bool s_useDirectWrite;
static IDWriteFactory* s_directWriteFactory;
static bool s_useSubpixelPositioning;
+ static HashMap<String, SkTypeface*>* s_sideloadedFonts;
#endif
#if OS(MACOSX) || OS(ANDROID)
« no previous file with comments | « no previous file | Source/platform/fonts/skia/FontCacheSkia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698