add Method param to drawTextOnPath, supporting SVG spec

src/core/SkCanvas.cpp

 /*
  * Copyright 2008 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 "SkCanvas.h"
 #include "SkCanvasPriv.h"
 #include "SkBitmapDevice.h"
@@ skipping 2172 matching lines @@
     while (iter.next()) {
         SkDeviceFilteredPaint dfp(iter.fDevice, looper.paint());
         iter.fDevice->drawPosText(iter, text, byteLength, xpos, 1, textOffset,
                                   dfp.paint());
     }
 
     LOOPER_END
 }
 
 void SkCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                const SkMatrix* matrix, const SkPaint& paint) {
+                                const SkMatrix* matrix,
+                                SK_SUPPORT_LEGACY_DRAWTEXTONPATH_PARAM
+                                const SkPaint& paint) {
     LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, NULL)
 
     while (iter.next()) {
         iter.fDevice->drawTextOnPath(iter, text, byteLength, path,
-                                     matrix, looper.paint());
+                                     matrix, SK_SUPPORT_LEGACY_DRAWTEXTONPATH_ARG looper.paint());
     }
 
     LOOPER_END
 }
 
 void SkCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                               const SkPaint& paint) {
 
     if (paint.canComputeFastBounds()) {
         SkRect storage;
@@ skipping 23 matching lines @@
                            const SkPaint& paint) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPosText()");
     this->onDrawPosText(text, byteLength, pos, paint);
 }
 void SkCanvas::drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
                             SkScalar constY, const SkPaint& paint) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPosTextH()");
     this->onDrawPosTextH(text, byteLength, xpos, constY, paint);
 }
 void SkCanvas::drawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                              const SkMatrix* matrix, const SkPaint& paint) {
+                              const SkMatrix* matrix, TextOnPathMethod method,
+                              const SkPaint& paint) {
+    if (0 == byteLength || path.isEmpty()) {
+        return;
+    }
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawTextOnPath()");
-    this->onDrawTextOnPath(text, byteLength, path, matrix, paint);
+    this->onDrawTextOnPath(text, byteLength, path, matrix,
+                           SK_SUPPORT_LEGACY_DRAWTEXTONPATH_ARG paint);
 }
 void SkCanvas::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                             const SkPaint& paint) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawTextBlob()");
     if (blob) {
         this->onDrawTextBlob(blob, x, y, paint);
     }
 }
 
 void SkCanvas::onDrawVertices(VertexMode vmode, int vertexCount,
@@ skipping 161 matching lines @@
             path.moveTo(oval.centerX(), oval.centerY());
         }
         path.arcTo(oval, startAngle, sweepAngle, !useCenter);
         if (useCenter) {
             path.close();
         }
         this->drawPath(path, paint);
     }
 }
 
-void SkCanvas::drawTextOnPathHV(const void* text, size_t byteLength,
+#ifdef SK_SUPPORT_LEGACY_DRAWTEXTONPATH
+void SkCanvas::drawTextOnPathHV(const void* text, size_t length,
                                 const SkPath& path, SkScalar hOffset,
                                 SkScalar vOffset, const SkPaint& paint) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawTextOnPathHV()");
     SkMatrix    matrix;
+    
+    matrix.setTranslate(hOffset, vOffset);
+    this->drawTextOnPath(text, length, path, &matrix, SkCanvas::kStretch_TextOnPathMethod, paint);
+}
 
-    matrix.setTranslate(hOffset, vOffset);
-    this->drawTextOnPath(text, byteLength, path, &matrix, paint);
+void SkCanvas::drawTextOnPath(const void* text, size_t length, const SkPath& path,
+                              const SkMatrix* matrix, const SkPaint& paint) {
+    this->drawTextOnPath(text, length, path, matrix, SkCanvas::kStretch_TextOnPathMethod, paint);
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 void SkCanvas::drawPicture(const SkPicture* picture) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPicture()");
     if (picture) {
         this->onDrawPicture(picture, NULL, NULL);
     }
 }
 
 void SkCanvas::drawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint) {
@@ skipping 119 matching lines @@
     }
 
     if (matrix) {
         canvas->concat(*matrix);
     }
 }
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }