third_party/WebKit/Source/web/win/WebFontRendering.cpp - Issue 1591883002: 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/web/win/WebFontRendering.cpp

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

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

Index: third_party/WebKit/Source/web/win/WebFontRendering.cpp

diff --git a/third_party/WebKit/Source/web/win/WebFontRendering.cpp b/third_party/WebKit/Source/web/win/WebFontRendering.cpp

index 758922b38cd422b771edeeb46d4ee335e3710d0b..829473e8657d5be8e3e3d4d63a4439a0c4260403 100644

--- a/third_party/WebKit/Source/web/win/WebFontRendering.cpp

+++ b/third_party/WebKit/Source/web/win/WebFontRendering.cpp

@@ -15,9 +15,10 @@ void WebFontRendering::setUseDirectWrite(bool useDirectWrite)

}

// static

-void WebFontRendering::setDirectWriteFactory(IDWriteFactory* factory)

+void WebFontRendering::setSkiaFontManager(SkFontMgr* fontMgr)

{

- FontCache::setDirectWriteFactory(factory);

+ adopted(fontMgr);

+ FontCache::setFontManager(RefPtr<SkFontMgr>(fontMgr));

}

// static