diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkPaint.cpp | 3 | ||||
-rw-r--r-- | src/core/SkScalerContext.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 3dd87b7aa6..89a8cd0872 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -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(); diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h index 609e9dd673..337b2e077a 100644 --- a/src/core/SkScalerContext.h +++ b/src/core/SkScalerContext.h @@ -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]; |