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

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

Issue 1591883002: Add plumbing in blink to allow overriding the default font collection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add back the option to use blink with DirectWrite without specifying a font manager, which was appa… Created 4 years, 10 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
Index: third_party/WebKit/Source/platform/fonts/FontCache.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.h b/third_party/WebKit/Source/platform/fonts/FontCache.h
index 1b83f7de4b67e8da6b8d81a40b1c935b0e982c66..cbf5096d0f3d0090660fc593fcd8992ac4db2f5d 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCache.h
+++ b/third_party/WebKit/Source/platform/fonts/FontCache.h
@@ -46,7 +46,6 @@
#if OS(WIN)
#include "SkFontMgr.h"
-struct IDWriteFactory;
#endif
class SkTypeface;
@@ -107,7 +106,7 @@ public:
static bool useDirectWrite() { return s_useDirectWrite; }
static float deviceScaleFactor() { return s_deviceScaleFactor; }
static void setUseDirectWrite(bool useDirectWrite) { s_useDirectWrite = useDirectWrite; }
- static void setDirectWriteFactory(IDWriteFactory* factory) { s_directWriteFactory = factory; }
+ static void setFontManager(const RefPtr<SkFontMgr>&);
static void setDeviceScaleFactor(float deviceScaleFactor) { s_deviceScaleFactor = deviceScaleFactor; }
static void setUseSubpixelPositioning(bool useSubpixelPositioning) { s_useSubpixelPositioning = useSubpixelPositioning; }
static void addSideloadedFontForTesting(SkTypeface*);
@@ -176,9 +175,9 @@ private:
int m_purgePreventCount;
#if OS(WIN)
- OwnPtr<SkFontMgr> m_fontManager;
+ RefPtr<SkFontMgr> m_fontManager;
static bool s_useDirectWrite;
- static IDWriteFactory* s_directWriteFactory;
+ static SkFontMgr* s_fontManager;
static float s_deviceScaleFactor;
static bool s_useSubpixelPositioning;
static HashMap<String, RefPtr<SkTypeface>>* s_sideloadedFonts;

Powered by Google App Engine
This is Rietveld 408576698