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
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 3dd87b7..89a8cd0 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -1553,8 +1553,7 @@
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 609e9dd..337b2e0 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -25,7 +25,6 @@
* 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];