add Method param to drawTextOnPath, supporting SVG spec

src/pipe/SkGPipeWrite.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 "SkAnnotation.h"
 #include "SkBitmapDevice.h"
@@ skipping 239 matching lines @@
     void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
 
     void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
     virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                             const SkPaint&) SK_OVERRIDE;
     virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
                                const SkPaint&) SK_OVERRIDE;
     virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
                                 SkScalar constY, const SkPaint&) SK_OVERRIDE;
     virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
+                                  const SkMatrix*,
+                                 SK_SUPPORT_LEGACY_DRAWTEXTONPATH_PARAM const SkPaint&) SK_OVERRIDE;

[f(malita), 2015/02/16 15:31:50]

indentation

     virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                                 const SkPaint& paint) SK_OVERRIDE;
     virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
                              const SkPoint texCoords[4], SkXfermode* xmode,
                              const SkPaint& paint) SK_OVERRIDE;
     void onDrawPaint(const SkPaint&) SK_OVERRIDE;
     void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE;
     void onDrawRect(const SkRect&, const SkPaint&) SK_OVERRIDE;
     void onDrawOval(const SkRect&, const SkPaint&) SK_OVERRIDE;
     void onDrawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE;
@@ skipping 594 matching lines @@
             fWriter.write32(SkToU32(byteLength));
             fWriter.writePad(text, byteLength);
             fWriter.write32(count);
             fWriter.write(xpos, count * sizeof(SkScalar));
             fWriter.writeScalar(constY);
         }
     }
 }
 
 void SkGPipeCanvas::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) {
+    SK_SUPPORT_LEGACY_DRAWTEXTONPATH_DEFAULT_METHOD
     if (byteLength) {
         NOTIFY_SETUP(this);
         unsigned flags = 0;
         size_t size = 4 + SkAlign4(byteLength) + path.writeToMemory(NULL);
         if (matrix) {
             flags |= kDrawTextOnPath_HasMatrix_DrawOpFlag;
             size += matrix->writeToMemory(NULL);
         }
         this->writePaint(paint);
         if (this->needOpBytes(size)) {
             this->writeOp(kDrawTextOnPath_DrawOp, flags, 0);
 
             fWriter.write32(SkToU32(byteLength));
             fWriter.writePad(text, byteLength);
 
             fWriter.writePath(path);
             if (matrix) {
                 fWriter.writeMatrix(*matrix);
             }
+            fWriter.write32(method);
         }
     }
 }
 
 size_t SkGPipeCanvas::getInProcessTypefaces(const SkRefCntSet& typefaceSet,
                                             TypefaceBuffer* buffer) {
     // When in-process, we simply write out the typeface pointers.
     size_t size = typefaceSet.count() * sizeof(SkTypeface*);
     buffer->reset(size);
     typefaceSet.copyToArray(reinterpret_cast<SkRefCnt**>(buffer->get()));
@@ skipping 425 matching lines @@
     return fCanvas->shuttleBitmap(bitmap, slot);
 }
 
 void BitmapShuttle::removeCanvas() {
     if (NULL == fCanvas) {
         return;
     }
     fCanvas->unref();
     fCanvas = NULL;
 }