add Method param to drawTextOnPath, supporting SVG spec

gm/shadertext2.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 
-namespace skiagm {
-
 static void makebm(SkBitmap* bm, int w, int h) {
     bm->allocN32Pixels(w, h);
     bm->eraseColor(SK_ColorTRANSPARENT);
 
     SkCanvas    canvas(*bm);
     SkScalar    s = SkIntToScalar(SkMin32(w, h));
     static const SkPoint     kPts0[] = { { 0, 0 }, { s, s } };
     static const SkPoint     kPts1[] = { { s, 0 }, { 0, s } };
     static const SkScalar    kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 };
     static const SkColor kColors0[] = {0x40FF00FF, 0xF0FFFF00, 0x4000FFFF };
@@ skipping 10 matching lines @@
     canvas.drawPaint(paint);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 struct LabeledMatrix {
     SkMatrix    fMatrix;
     const char* fLabel;
 };
 
-class ShaderText2GM : public GM {
+class ShaderText2GM : public skiagm::GM {
+    SkCanvas::TextOnPathMethod  fMethod;
+    SkString                    fName;
+
 public:
-    ShaderText2GM() {
+    ShaderText2GM(SkCanvas::TextOnPathMethod method) : fMethod(method) {
         this->setBGColor(0xFFDDDDDD);
+        
+        fName.set("shadertext2");
+        if (SkCanvas::kAlign_TextOnPathMethod == fMethod) {
+            fName.append("_align");
+        }
     }
 
 protected:
 
-    SkString onShortName() SK_OVERRIDE {
-        return SkString("shadertext2");
-    }
+    SkString onShortName() SK_OVERRIDE { return fName; }
 
     SkISize onISize() SK_OVERRIDE { return SkISize::Make(1800, 900); }
 
     void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         static const char kText[] = "SKIA";
         static const int kTextLen = SK_ARRAY_COUNT(kText) - 1;
         static const int kPointSize = 55;
 
         SkTDArray<LabeledMatrix> matrices;
         matrices.append()->fMatrix.reset();
@@ skipping 103 matching lines @@
                                                 1.2f * w, 2.f * kPointSize),
                                                 225.f, 359.f,
                                                 false);
                     path.close();
 
                     canvas->translate(0.f, kPointSize + kPadY);
                     columnH += kPointSize + kPadY;
 
                     canvas->save();
                         canvas->concat(matrices[m].fMatrix);
-                        canvas->drawTextOnPath(kText, kTextLen, path, NULL, paint);
-                        canvas->drawTextOnPath(kText, kTextLen, path, NULL, outlinePaint);
+                        canvas->drawTextOnPath(kText, kTextLen, path, NULL, fMethod, paint);
+                        canvas->drawTextOnPath(kText, kTextLen, path, NULL, fMethod, outlinePaint);
                     canvas->restore();
                     SkPaint stroke;
                     stroke.setStyle(SkPaint::kStroke_Style);
                     canvas->translate(0.f, kPointSize + kPadY);
                     columnH += kPointSize + kPadY;
                 }
                 canvas->restore();
                 canvas->translate(w + kPadX, 0.f);
             }
             if (0 == s) {
                 canvas->drawLine(0.f, -kPadY, 0.f, columnH + kPadY, outlinePaint);
                 canvas->translate(kPadX / 2, 0.f);
                 static const char kFillLabel[] = "Filled";
                 static const char kStrokeLabel[] = "Stroked";
                 SkScalar y = columnH + kPadY / 2;
                 SkScalar fillX = -outlinePaint.measureText(kFillLabel, strlen(kFillLabel)) - kPadX;
                 SkScalar strokeX = kPadX;
                 canvas->drawText(kFillLabel, strlen(kFillLabel), fillX, y, labelPaint);
                 canvas->drawText(kStrokeLabel, strlen(kStrokeLabel), strokeX, y, labelPaint);
             }
         }
     }
 
 private:
-    typedef GM INHERITED;
+    typedef skiagm::GM INHERITED;
 };
 
-///////////////////////////////////////////////////////////////////////////////
-
-static GM* MyFactory(void*) { return new ShaderText2GM; }
-static GMRegistry reg(MyFactory);
-}
+DEF_GM( return new ShaderText2GM(SkCanvas::kAlign_TextOnPathMethod); )
+DEF_GM( return new ShaderText2GM(SkCanvas::kStretch_TextOnPathMethod); )