| Index: src/gpu/text/GrTextUtils.h | 
| diff --git a/src/gpu/text/GrTextUtils.h b/src/gpu/text/GrTextUtils.h | 
| index 52b3ab4c54f60d5db6ef917562b4089cda4094ef..7823473f771d09ee977e88a4e0605b246e46bf5a 100644 | 
| --- a/src/gpu/text/GrTextUtils.h | 
| +++ b/src/gpu/text/GrTextUtils.h | 
| @@ -38,13 +38,13 @@ public: | 
| static void DrawBmpText(GrAtlasTextBlob*, int runIndex, | 
| GrBatchFontCache*, const SkSurfaceProps&, | 
| const SkPaint&, | 
| -                            GrColor, SkPaint::FakeGamma, const SkMatrix& viewMatrix, | 
| +                            GrColor, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, | 
| const char text[], size_t byteLength, | 
| SkScalar x, SkScalar y); | 
|  | 
| static void DrawBmpPosText(GrAtlasTextBlob*, int runIndex, | 
| GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&, | 
| -                               GrColor, SkPaint::FakeGamma, const SkMatrix& viewMatrix, | 
| +                               GrColor, uint32_t scalerContextFlags, const SkMatrix& viewMatrix, | 
| const char text[], size_t byteLength, | 
| const SkScalar pos[], int scalarsPerPosition, | 
| const SkPoint& offset); | 
| @@ -55,14 +55,15 @@ public: | 
|  | 
| static void DrawDFText(GrAtlasTextBlob* blob, int runIndex, | 
| GrBatchFontCache*, const SkSurfaceProps&, | 
| -                           const SkPaint& skPaint, GrColor color, SkPaint::FakeGamma, | 
| +                           const SkPaint& skPaint, GrColor color, uint32_t scalerContextFlags, | 
| const SkMatrix& viewMatrix, | 
| const char text[], size_t byteLength, | 
| SkScalar x, SkScalar y); | 
|  | 
| static void DrawDFPosText(GrAtlasTextBlob* blob, int runIndex, | 
| GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&, | 
| -                              GrColor color, SkPaint::FakeGamma, const SkMatrix& viewMatrix, | 
| +                              GrColor color, uint32_t scalerContextFlags, | 
| +                              const SkMatrix& viewMatrix, | 
| const char text[], size_t byteLength, | 
| const SkScalar pos[], int scalarsPerPosition, | 
| const SkPoint& offset); | 
|  |