add Method param to drawTextOnPath, supporting SVG spec

samplecode/SampleSlides.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 "SkBlurMaskFilter.h"
@@ skipping 247 matching lines @@
     path.offset(0, -100);
 
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setTextSize(40);
 
     paint.setStyle(SkPaint::kStroke_Style);
     canvas->drawPath(path, paint);
     paint.setStyle(SkPaint::kFill_Style);
 
+    SkCanvas::TextOnPathMethod method = SkCanvas::kStretch_TextOnPathMethod;
+    SkMatrix matrix;
+
     SkScalar x = 50;
     paint.setColor(0xFF008800);
-    canvas->drawTextOnPathHV(text, len, path,
-                             x, paint.getTextSize()*2/3, paint);
+    matrix.setTranslate(x, paint.getTextSize()*2/3);
+    canvas->drawTextOnPath(text, len, path, &matrix, method, paint);
     paint.setColor(SK_ColorRED);
-    canvas->drawTextOnPathHV(text, len, path,
-                             x + 60, 0, paint);
+    matrix.setTranslate(x + 60, 0);
+    canvas->drawTextOnPath(text, len, path, &matrix, method, paint);
     paint.setColor(SK_ColorBLUE);
-    canvas->drawTextOnPathHV(text, len, path,
-                             x + 120, -paint.getTextSize()*2/3, paint);
+    matrix.setTranslate(x + 120, -paint.getTextSize()*2/3);
+    canvas->drawTextOnPath(text, len, path, &matrix, method, paint);
 
     path.offset(0, 200);
     paint.setTextAlign(SkPaint::kRight_Align);
 
     text = "Matrices";
     len = strlen(text);
     SkScalar pathLen = getpathlen(path);
-    SkMatrix matrix;
 
     paint.setColor(SK_ColorBLACK);
     paint.setStyle(SkPaint::kStroke_Style);
     canvas->drawPath(path, paint);
     paint.setStyle(SkPaint::kFill_Style);
 
     paint.setTextSize(50);
-    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(0xFF008800);
     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);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 
 static SkShader* make_shader0(SkIPoint* size) {
@@ skipping 400 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new SlideView; }
 static SkViewRegister reg(MyFactory);