Revert of Revert of Fix SkTextBlob offset semantics.

include/core/SkDraw.h

Index: include/core/SkDraw.h
diff --git a/include/core/SkDraw.h b/include/core/SkDraw.h
index 21d421004ac340fd5497a6f6e03cea0166613cdc..4b8d02b0ae76a2db85f528ceeffef0246064b732 100644
--- a/include/core/SkDraw.h
+++ b/include/core/SkDraw.h
@@ -60,8 +60,8 @@
     void    drawText(const char text[], size_t byteLength, SkScalar x,
                      SkScalar y, const SkPaint& paint) const;
     void    drawPosText(const char text[], size_t byteLength,
-                        const SkScalar pos[], SkScalar constY,
-                        int scalarsPerPosition, const SkPaint& paint) const;
+                        const SkScalar pos[], int scalarsPerPosition,
+                        const SkPoint& offset, const SkPaint& paint) const;
     void    drawTextOnPath(const char text[], size_t byteLength,
                         const SkPath&, const SkMatrix*, const SkPaint&) const;
     void    drawVertices(SkCanvas::VertexMode mode, int count,
@@ -113,8 +113,8 @@
     void        drawText_asPaths(const char text[], size_t byteLength,
                                  SkScalar x, SkScalar y, const SkPaint&) const;
     void        drawPosText_asPaths(const char text[], size_t byteLength,
-                                    const SkScalar pos[], SkScalar constY,
-                                    int scalarsPerPosition, const SkPaint&) const;
+                                    const SkScalar pos[], int scalarsPerPosition,
+                                    const SkPoint& offset, const SkPaint&) const;
 
 private:
     void    drawDevMask(const SkMask& mask, const SkPaint&) const;