third_party/WebKit/Source/platform/fonts/FontCache.cpp - Issue 1682813004: Revert of Add plumbing in blink to allow overriding the default font collection.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/fonts/FontCache.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

« no previous file with comments | « third_party/WebKit/Source/platform/fonts/FontCache.h ('k') | third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/FontCache.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.cpp b/third_party/WebKit/Source/platform/fonts/FontCache.cpp

index 6a13692eb211c6f4b7848a2672255f2a86686ff1..462f0d04ff0cd9443d31061f85b23e7733a538f1 100644

--- a/third_party/WebKit/Source/platform/fonts/FontCache.cpp

+++ b/third_party/WebKit/Source/platform/fonts/FontCache.cpp

@@ -72,7 +72,7 @@

#if OS(WIN)

bool FontCache::s_useDirectWrite = false;

-SkFontMgr* FontCache::s_fontManager = nullptr;

+IDWriteFactory* FontCache::s_directWriteFactory = 0;

bool FontCache::s_useSubpixelPositioning = false;

float FontCache::s_deviceScaleFactor = 1.0;

#endif // OS(WIN)

@@ -146,16 +146,6 @@

return fontVerticalDataCache;

}

-#if OS(WIN)

-void FontCache::setFontManager(const RefPtr<SkFontMgr>& fontManager)

- ASSERT(!s_fontManager);

- s_fontManager = fontManager.get();

- // Explicitly AddRef since we're going to hold on to the object for the life of the program.

- s_fontManager->ref();

-#endif

PassRefPtr<OpenTypeVerticalData> FontCache::getVerticalData(const FontFileKey& key, const FontPlatformData& platformData)

{

FontVerticalDataCache& fontVerticalDataCache = fontVerticalDataCacheInstance();