Fix several issues with drawing text as paths.

src/core/SkDraw.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDraw.h"
 #include "SkBlitter.h"
@@ skipping 2090 matching lines @@
                 break;
             default:
                 SkDEBUGFAIL("unknown verb");
                 break;
         }
     }
 }
 
 void SkDraw::drawTextOnPath(const char text[], size_t byteLength,
                             const SkPath& follow, const SkMatrix* matrix,
-                            const SkPaint& paint) const {
+                            const SkPaint& origPaint) const {
     SkASSERT(byteLength == 0 || text != NULL);
 
     // nothing to draw
     if (text == NULL || byteLength == 0 || fRC->isEmpty()) {
         return;
     }
 
+    // setup our std paint, in hopes of getting hits in the cache
+    SkPaint paint(origPaint);
+    SkScalar textScale = paint.setupForAsPaths();
     SkTextToPathIter    iter(text, byteLength, paint, true);
+
     SkPathMeasure       meas(follow, false);
     SkScalar            hOffset = 0;
 
     // need to measure first
     if (paint.getTextAlign() != SkPaint::kLeft_Align) {
         SkScalar pathLen = meas.getLength();
         if (paint.getTextAlign() == SkPaint::kCenter_Align) {
             pathLen = SkScalarHalf(pathLen);
         }
         hOffset += pathLen;
     }
 
-    const SkPath*   iterPath;
-    SkScalar        xpos;
-    SkMatrix        scaledMatrix;
-    SkScalar        scale = iter.getPathScale();
+    SkScalar scale = iter.getPathScale();
+    SkMatrix scaledMatrix;
+    scaledMatrix.setScale(scale * textScale, scale * textScale);
 
-    scaledMatrix.setScale(scale, scale);
-
+    const SkPath* iterPath;
+    SkScalar xpos;
     while (iter.next(&iterPath, &xpos)) {
         if (iterPath) {
             SkPath      tmp;
             SkMatrix    m(scaledMatrix);
 
-            m.postTranslate(xpos + hOffset, 0);
+            SkScalar xposScaled = xpos * textScale;
+            m.postTranslate(xposScaled + hOffset, 0);
             if (matrix) {
                 m.postConcat(*matrix);
             }
             morphpath(&tmp, *iterPath, meas, m);
             if (fDevice) {
                 fDevice->drawPath(*this, tmp, iter.getPaint(), NULL, true);
             } else {
                 this->drawPath(tmp, iter.getPaint(), NULL, true);
             }
         }
@@ skipping 663 matching lines @@
         mask->fImage = SkMask::AllocImage(size);
         memset(mask->fImage, 0, mask->computeImageSize());
     }
 
     if (SkMask::kJustComputeBounds_CreateMode != mode) {
         draw_into_mask(*mask, devPath, style);
     }
 
     return true;
 }