third_party/WebKit/Source/platform/fonts/FontCache.cpp - Issue 1693563003: Take Accept-Language into account in CJK font fallback for Android/Win

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 1693563003: Take Accept-Language into account in CJK font fallback for Android/Win (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@aceept-lang

Patch Set: Fix non-Windows builds 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/AcceptLanguagesResolverTest.cpp ('k') | third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.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 649e475b77286cadc795edc066c661081bacfdd4..d2b7c7c73da3eccd6a7aa465f8a5cf38fd7182d6 100644

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

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

@@ -33,6 +33,7 @@

#include "platform/Histogram.h"

#include "platform/RuntimeEnabledFeatures.h"

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

#include "platform/fonts/AlternateFontFamily.h"

#include "platform/fonts/FontCacheClient.h"

#include "platform/fonts/FontCacheKey.h"

@@ -161,6 +162,11 @@ PassRefPtr<OpenTypeVerticalData> FontCache::getVerticalData(const FontFileKey& k

return verticalData;

}

+void FontCache::acceptLanguagesChanged(const String& acceptLanguages)

+ AcceptLanguagesResolver::acceptLanguagesChanged(acceptLanguages);

static FontDataCache* gFontDataCache = 0;

PassRefPtr<SimpleFontData> FontCache::getFontData(const FontDescription& fontDescription, const AtomicString& family, bool checkingAlternateName, ShouldRetain shouldRetain)