diff options
| author |  bungeman <bungeman@google.com> | 2014-08-18 07:57:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-18 07:57:35 -0700 |
| commit | ec730b9cafaa3b2a4df7e7ceb3ab50601796fbe5 (patch) | |
| tree | 730d398dbead63c7b738a9db0bf630efe26a768c | |
| parent | 8a986721926f77aba3772acb5d1c575072acd05c (diff) | |
Remove fOrigFontID from SkScalerContextRec.
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
| -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]; |