src/core/SkScalerContext.cpp - Issue 14761003: API modifications needed to upstream Android font changes.

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: src/core/SkScalerContext.cpp

Issue 14761003: API modifications needed to upstream Android font changes. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: refactored for upstream Created 7 years, 7 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:

Index: src/core/SkScalerContext.cpp

diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp

index 93abf6b3c25e28d67f0111ae0bc6508dfdbc4bcb..8fefb1dbe92507f0faed3affb86568bb3859e327 100644

--- a/src/core/SkScalerContext.cpp

+++ b/src/core/SkScalerContext.cpp

@@ -124,8 +124,7 @@ SkScalerContext::~SkScalerContext() {

// there are no more entries in the fallback chain.

SkScalerContext* SkScalerContext::allocNextContext() const {

#ifdef SK_BUILD_FOR_ANDROID

- SkTypeface* newFace = SkAndroidNextLogicalTypeface(fRec.fFontID,

- fRec.fOrigFontID);

+ SkTypeface* newFace = SkAndroidNextLogicalTypeface(fRec);

if (0 == newFace) {

return NULL;

}