third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp - Issue 1931393002: Introduce typeface cache in blink::FontCache

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/skia/FontCacheSkia.cpp

Issue 1931393002: Introduce typeface cache in blink::FontCache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: wip: others 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/Source/platform/fonts/shaping/HarfBuzzShaper.cpp ('k') | third_party/WebKit/Source/platform/testing/FontTestHelpers.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

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

index 780d5675245257450b0af5714daf1d93716f5652..f0ce5c43f03e0b34d71968ddf1966f61b544d126 100644

--- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

+++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

@@ -201,7 +201,7 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDesc

#if !OS(WIN)

PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,

- const FontFaceCreationParams& creationParams, float fontSize)

+ const FontFaceCreationParams& creationParams)

{

CString name;

RefPtr<SkTypeface> tf(createTypeface(fontDescription, creationParams, name));

@@ -210,7 +210,6 @@ PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescrip

return adoptPtr(new FontPlatformData(tf,

name.data(),

- fontSize,

(fontDescription.weight() > 200 + tf->fontStyle().weight()) || fontDescription.isSyntheticBold(),

((fontDescription.style() == FontStyleItalic || fontDescription.style() == FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(),

fontDescription.orientation()));