Revert of Revert of Fix SkTextBlob offset semantics.

src/device/xps/SkXPSDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef UNICODE
 #define UNICODE
 #endif
@@ skipping 2147 matching lines @@
                   procs.xpsGlyphs.begin(), procs.xpsGlyphs.count(),
                   &origin,
                   SkScalarToFLOAT(paint.getTextSize()),
                   XPS_STYLE_SIMULATION_NONE,
                   *d.fMatrix,
                   paint));
 }
 
 void SkXPSDevice::drawPosText(const SkDraw& d,
                               const void* text, size_t byteLen,
-                              const SkScalar pos[],
-                              SkScalar constY, int scalarsPerPos,
-                              const SkPaint& paint) {
+                              const SkScalar pos[], int scalarsPerPos,
+                              const SkPoint& offset, const SkPaint& paint) {
     if (byteLen < 1) return;
 
     if (text_must_be_pathed(paint, *d.fMatrix)) {
         SkPath path;
         //TODO: make this work, Draw currently does not handle as well.
         //paint.getTextPath(text, byteLength, x, y, &path);
         //this->drawPath(d, path, paint, NULL, true);
         //TODO: add automation "text"
         return;
     }
 
     TypefaceUse* typeface;
     HRV(CreateTypefaceUse(paint, &typeface));
 
     SkDraw myDraw(d);
     myDraw.fMatrix = &SkMatrix::I();
     SkXPSDrawProcs procs;
     text_draw_init(paint, text, byteLen, *typeface->glyphsUsed, myDraw, procs);
 
-    myDraw.drawPosText(static_cast<const char*>(text), byteLen,
-                       pos, constY, scalarsPerPos,
-                       paint);
+    myDraw.drawPosText(static_cast<const char*>(text), byteLen, pos, scalarsPerPos, offset, paint);
 
     // SkDraw may have clipped out the glyphs, so we need to check
     if (procs.xpsGlyphs.count() == 0) {
         return;
     }
 
     XPS_POINT origin = {
         procs.xpsGlyphs[0].horizontalOffset / procs.centemPerUnit,
         procs.xpsGlyphs[0].verticalOffset / -procs.centemPerUnit,
     };
@@ skipping 74 matching lines @@
              IID_PPV_ARGS(&this->fXpsFactory)),
          "Could not create factory for layer.");
 
     HRVM(this->fXpsFactory->CreateCanvas(&this->fCurrentXpsCanvas),
          "Could not create canvas for layer.");
 }
 
 bool SkXPSDevice::allowImageFilter(const SkImageFilter*) {
     return false;
 }