AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove fOrigFontID from SkScalerContextRec.

Browse Source 
With the recent Android changes and removal of chaining, this is no longer used.

R=djsollen@google.com, reed@google.com

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/476713003
This commit is contained in:
bungeman 2014-08-18 07:57:35 -07:00 committed by Commit bot
parent 8a98672192
commit ec730b9caf
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/SkPaint.cpp
View File

@ -1553,8 +1553,7 @@ void SkScalerContext::MakeRec(const SkPaint& paint,
if (NULL == typeface) {
typeface = SkTypeface::GetDefaultTypeface();
}
rec->fOrigFontID = typeface->uniqueID();
rec->fFontID = rec->fOrigFontID;
rec->fFontID = typeface->uniqueID();
rec->fTextSize = paint.getTextSize();
rec->fPreScaleX = paint.getTextScaleX();
rec->fPreSkewX = paint.getTextSkewX();

1
src/core/SkScalerContext.h
View File

@ -25,7 +25,6 @@ class SkRasterizer;
* than a nested struct inside SkScalerContext (where it started).
*/
struct SkScalerContextRec {
uint32_t fOrigFontID;
uint32_t fFontID;
SkScalar fTextSize, fPreScaleX, fPreSkewX;
SkScalar fPost2x2[2][2];