third_party/WebKit/Source/web/linux/WebFontRendering.cpp - Issue 1685053002: blink fonts: Load Android SkFontMgr on Linux.

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/linux/WebFontRendering.cpp

Issue 1685053002: blink fonts: Load Android SkFontMgr on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@windows_change

Patch Set: Rebase. 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/skia/FontCacheSkia.cpp ('K') | « third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp ('k') | third_party/WebKit/public/web/linux/WebFontRendering.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 621ff44ff9068862aee7bee9814be55a8efcaf1b..63b21a3a5a4852496c5beaec261ba7ff1d172e35 100644

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

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

@@ -31,6 +31,7 @@

#include "public/web/linux/WebFontRendering.h"

#include "core/layout/LayoutThemeFontProvider.h"

+#include "platform/fonts/FontCache.h"

#include "platform/fonts/FontDescription.h"

#include "platform/fonts/FontPlatformData.h"

@@ -40,6 +41,13 @@ using blink::FontPlatformData;

namespace blink {

// static

+void WebFontRendering::setSkiaFontManager(SkFontMgr* fontMgr)

+ WTF::adopted(fontMgr);

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

+// static

void WebFontRendering::setHinting(SkPaint::Hinting hinting)

{

FontPlatformData::setHinting(hinting);