third_party/WebKit/Source/platform/fonts/FontCache.h - Issue 1911863002: Revert of Add code to call skia's matchFamilyStyleCharacter API, which uses the

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.h

Issue 1911863002: Revert of Add code to call skia's matchFamilyStyleCharacter API, which uses the (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fallbackproxy

Patch Set: Created 4 years, 8 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/LayoutTests/fast/text/font-fallback-win-expected.html ('k') | third_party/WebKit/Source/platform/fonts/FontCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e9e5d67a535ade028d047c4060eb44b62c64eadb..10e5f6115500206d02effac477cfabe8a67aa88c 100644

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

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

@@ -123,7 +123,6 @@

static const AtomicString& smallCaptionFontFamily() { return *s_smallCaptionFontFamilyName; }

static int32_t statusFontHeight() { return s_statusFontHeight; }

static const AtomicString& statusFontFamily() { return *s_statusFontFamilyName; }

- static void setUseSkiaFontFallback(bool useSkiaFontFallback) { s_useSkiaFontFallback = useSkiaFontFallback; }

#endif

typedef uint32_t FontFileKey;

@@ -202,7 +201,6 @@

static int32_t s_smallCaptionFontHeight;

static AtomicString* s_statusFontFamilyName;

static int32_t s_statusFontHeight;

- static bool s_useSkiaFontFallback;

#endif

friend class SimpleFontData; // For fontDataFromFontPlatformData

@@ -217,8 +215,6 @@

~FontCachePurgePreventer() { FontCache::fontCache()->enablePurging(); }

};

-CString toSkFontMgrLocale(const String& locale);

} // namespace blink

#endif