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

Unified Diff: third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

Issue 1682813004: Revert of Add plumbing in blink to allow overriding the default font collection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/win/FontCacheSkiaWin.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
index 0c4ef28ceff35ebc4692549cea495e3165e966a4..b34762474b583cb88d8e45eb0babd6413200017a 100644
--- a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
+++ b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
@@ -97,19 +97,19 @@
FontCache::FontCache()
: m_purgePreventCount(0)
{
- if (s_fontManager) {
- adopted(s_fontManager);
- m_fontManager = s_fontManager;
- } else if (s_useDirectWrite) {
- m_fontManager = adoptRef(SkFontMgr_New_DirectWrite());
+ SkFontMgr* fontManager;
+
+ if (s_useDirectWrite) {
+ fontManager = SkFontMgr_New_DirectWrite(s_directWriteFactory);
+ s_useSubpixelPositioning = true;
} else {
- m_fontManager = adoptRef(SkFontMgr_New_GDI());
- }
-
- // Subpixel text positioning is only supported by the DirectWrite backend (not GDI).
- s_useSubpixelPositioning = s_useDirectWrite;
-
- ASSERT(m_fontManager.get());
+ fontManager = SkFontMgr_New_GDI();
+ // Subpixel text positioning is not supported by the GDI backend.
+ s_useSubpixelPositioning = false;
+ }
+
+ ASSERT(fontManager);
+ m_fontManager = adoptPtr(fontManager);
}
« no previous file with comments | « third_party/WebKit/Source/platform/fonts/FontCache.cpp ('k') | third_party/WebKit/Source/web/win/WebFontRendering.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698