Chromium Code Reviews| Index: src/utils/SkDeferredCanvas.cpp |
| diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp |
| index 7da85327167b1d7823a681378051f4bd02579928..8811a4c9cc4325ee08f23c1fafb4f89200bd6be4 100644 |
| --- a/src/utils/SkDeferredCanvas.cpp |
| +++ b/src/utils/SkDeferredCanvas.cpp |
| @@ -209,9 +209,8 @@ protected: |
| const SkScalar pos[], int scalarsPerPos, |
| const SkPoint& offset, const SkPaint& paint) SK_OVERRIDE |
| {SkASSERT(0);} |
| - virtual void drawTextOnPath(const SkDraw&, const void* text, |
| - size_t len, const SkPath& path, |
| - const SkMatrix* matrix, |
| + virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len, const SkPath& path, |
| + const SkMatrix* matrix, SK_SUPPORT_LEGACY_DRAWTEXTONPATH_PARAM |
| const SkPaint& paint) SK_OVERRIDE |
| {SkASSERT(0);} |
| virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, |
| @@ -892,9 +891,11 @@ void SkDeferredCanvas::onDrawPosTextH(const void* text, size_t byteLength, const |
| } |
| void SkDeferredCanvas::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) { |
|
f(malita)
2015/02/16 15:31:50
indentation
|
| AutoImmediateDrawIfNeeded autoDraw(*this, &paint); |
| - this->drawingCanvas()->drawTextOnPath(text, byteLength, path, matrix, paint); |
| + this->drawingCanvas()->drawTextOnPath(text, byteLength, path, matrix, |
| + SK_SUPPORT_LEGACY_DRAWTEXTONPATH_ARG paint); |
| this->recordedDrawCommand(); |
| } |