include/ports/SkTypeface_android.h - Issue 14761003: API modifications needed to upstream Android font changes.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: include/ports/SkTypeface_android.h

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:

View unified diff | Download patch | Annotate | Revision Log

« include/core/SkPaint.h ('K') | « include/core/SkPaintOptionsAndroid.h ('k') | src/core/SkPaint.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright 2012 Google Inc.	2 * Copyright 2012 Google Inc.

3 *	3 *

4 * Use of this source code is governed by a BSD-style license that can be	4 * Use of this source code is governed by a BSD-style license that can be

5 * found in the LICENSE file.	5 * found in the LICENSE file.

6 */	6 */

7	7

8	8

9 #ifndef SkTypeface_android_DEFINED	9 #ifndef SkTypeface_android_DEFINED

10 #define SkTypeface_android_DEFINED	10 #define SkTypeface_android_DEFINED

(...skipping 21 matching lines...) Expand all Loading...
32 * on. This process must be finite, and when the fonthost sees a	32 * on. This process must be finite, and when the fonthost sees a

33 * font with no logical successor, it must return NULL.	33 * font with no logical successor, it must return NULL.

34 *	34 *

35 * The original fontID is also provided. This is the initial font that was	35 * The original fontID is also provided. This is the initial font that was

36 * stored in the typeface of the caller. It is provided as an aid to choose	36 * stored in the typeface of the caller. It is provided as an aid to choose

37 * the best next logical font. e.g. If the original font was bold or serif,	37 * the best next logical font. e.g. If the original font was bold or serif,

38 * but the 2nd in the logical chain was plain, then a subsequent call to	38 * but the 2nd in the logical chain was plain, then a subsequent call to

39 * get the 3rd can still inspect the original, and try to match its	39 * get the 3rd can still inspect the original, and try to match its

40 * stylistic attributes.	40 * stylistic attributes.

41 */	41 */

42 SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontI D);	42 SkTypeface* SkAndroidNextLogicalTypeface(const SkScalerContextRec& rec);

43	43

44 #endif	44 #endif

OLD	NEW