Revert of Revert of Fix SkTextBlob offset semantics.

src/gpu/GrStencilAndCoverTextContext.h

Index: src/gpu/GrStencilAndCoverTextContext.h
diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/GrStencilAndCoverTextContext.h
index 5ba4a7027b370d49296f7ef2785cf19b972a1c18..b6e23bdb3feeb0b2bd5667d0c235716a22485ddb 100644
--- a/src/gpu/GrStencilAndCoverTextContext.h
+++ b/src/gpu/GrStencilAndCoverTextContext.h
@@ -32,8 +32,8 @@
                           SkScalar x, SkScalar y) SK_OVERRIDE;
     virtual void drawPosText(const GrPaint&, const SkPaint&,
                              const char text[], size_t byteLength,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPosition) SK_OVERRIDE;
+                             const SkScalar pos[], int scalarsPerPosition,
+                             const SkPoint& offset) SK_OVERRIDE;
 
     virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
 
@@ -62,7 +62,7 @@
     };
 
     void init(const GrPaint&, const SkPaint&, size_t textByteLength,
-              RenderMode, SkScalar textTranslateY = 0);
+              RenderMode, const SkPoint& textTranslate);
     void initGlyphs(SkGlyphCache* cache);
     void appendGlyph(uint16_t glyphID, float x);
     void appendGlyph(uint16_t glyphID, float x, float y);