add Method param to drawTextOnPath, supporting SVG spec

samplecode/SampleTextOnPath.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.
  */
 #include "SampleCode.h"
 #include "SkBlurMask.h"
 #include "SkBlurDrawLooper.h"
@@ skipping 24 matching lines @@
 
     canvas->drawPath(path, paint);
 
     paint.setLooper(SkBlurDrawLooper::Create(SK_ColorBLACK,
                                              SkBlurMask::ConvertRadiusToSigma(0.002f),
                                              0.0f,
                                              0.0f))->unref();
 
     const char* text = "DRAWING STROKED TEXT WITH A BLUR ON A PATH";
     size_t      len = strlen(text);
+    SkMatrix    matrix;
+    SkCanvas::TextOnPathMethod method = SkCanvas::kStretch_TextOnPathMethod;
 
-    canvas->drawTextOnPathHV(text, len, path, 0,
-                             -0.025f, paint);
+    matrix.setTranslate(0, -0.025f);
+    canvas->drawTextOnPath(text, len, path, &matrix, method, paint);
     canvas->restore();
 }
 
 static void textPathMatrix(SkCanvas* canvas) {
     SkPaint paint;
     SkPath  path;
     SkMatrix matrix;
 
     path.moveTo(SkIntToScalar(050), SkIntToScalar(200));
     path.quadTo(SkIntToScalar(250), SkIntToScalar(000),
                 SkIntToScalar(450), SkIntToScalar(200));
 
     paint.setAntiAlias(true);
 
     paint.setStyle(SkPaint::kStroke_Style);
     canvas->drawPath(path, paint);
     paint.setStyle(SkPaint::kFill_Style);
     paint.setTextSize(SkIntToScalar(48));
     paint.setTextAlign(SkPaint::kRight_Align);
 
     const char* text = "Reflection";
     size_t      len = strlen(text);
 
     SkPathMeasure   meas(path, false);
     SkScalar pathLen = meas.getLength();
+    SkCanvas::TextOnPathMethod method = SkCanvas::kStretch_TextOnPathMethod;
 
-    canvas->drawTextOnPath(text, len, path, NULL, paint);
+    canvas->drawTextOnPath(text, len, path, NULL, method, paint);
 
     paint.setColor(SK_ColorRED);
     matrix.setScale(-SK_Scalar1, SK_Scalar1);
     matrix.postTranslate(pathLen, 0);
-    canvas->drawTextOnPath(text, len, path, &matrix, paint);
+    canvas->drawTextOnPath(text, len, path, &matrix, method, paint);
 
     paint.setColor(SK_ColorBLUE);
     matrix.setScale(SK_Scalar1, -SK_Scalar1);
-    canvas->drawTextOnPath(text, len, path, &matrix, paint);
+    canvas->drawTextOnPath(text, len, path, &matrix, method, paint);
 
     paint.setColor(SK_ColorGREEN);
     matrix.setScale(-SK_Scalar1, -SK_Scalar1);
     matrix.postTranslate(pathLen, 0);
-    canvas->drawTextOnPath(text, len, path, &matrix, paint);
+    canvas->drawTextOnPath(text, len, path, &matrix, method, paint);
 }
 
 class TextOnPathView : public SampleView {
 public:
     SkPath      fPath;
     SkScalar    fHOffset;
 
     TextOnPathView() {
         SkRect r;
         r.set(SkIntToScalar(100), SkIntToScalar(100),
@@ skipping 14 matching lines @@
         return this->INHERITED::onQuery(evt);
     }
 
     void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setTextSize(SkIntToScalar(48));
 
         const char* text = "Hamburgefons";
         size_t      len = strlen(text);
-
+        SkCanvas::TextOnPathMethod method = SkCanvas::kStretch_TextOnPathMethod;
+        SkMatrix    matrix;
+    
         for (int j = 0; j < REPEAT_COUNT; j++) {
             SkScalar x = fHOffset;
 
             paint.setColor(SK_ColorBLACK);
-            canvas->drawTextOnPathHV(text, len, fPath,
-                                     x, paint.getTextSize()/2, paint);
+            matrix.setTranslate(x, paint.getTextSize()/2);
+            canvas->drawTextOnPath(text, len, fPath, &matrix, method, paint);
 
             paint.setColor(SK_ColorRED);
-            canvas->drawTextOnPathHV(text, len, fPath,
-                                     x + SkIntToScalar(50), 0, paint);
+            matrix.setTranslate(x + 50, 0);
+            canvas->drawTextOnPath(text, len, fPath, &matrix, method, paint);
 
             paint.setColor(SK_ColorBLUE);
-            canvas->drawTextOnPathHV(text, len, fPath,
-                         x + SkIntToScalar(100), -paint.getTextSize()/2, paint);
+            matrix.setTranslate(x + 100, -paint.getTextSize()/2);
+            canvas->drawTextOnPath(text, len, fPath, &matrix, method, paint);
         }
 
         paint.setColor(SK_ColorGREEN);
         paint.setStyle(SkPaint::kStroke_Style);
         canvas->drawPath(fPath, paint);
 
         canvas->translate(SkIntToScalar(275), 0);
         textStrokePath(canvas);
 
         canvas->translate(SkIntToScalar(-275), SkIntToScalar(250));
@@ skipping 18 matching lines @@
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() {
     return new TextOnPathView;
 }
 
 static SkViewRegister reg(MyFactory);