Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Unified Diff: src/pipe/SkGPipeWrite.cpp

Issue 933483002: add Method param to drawTextOnPath, supporting SVG spec Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: add guard for android Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/pipe/SkGPipeWrite.cpp
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index be687f7d313932cacc2f8b59f920bc232370e8d1..be6f2c307b05e41a450633ae27b714c8ce514761 100644
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -257,7 +257,8 @@ protected:
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],
@@ -872,7 +873,9 @@ void SkGPipeCanvas::onDrawPosTextH(const void* text, size_t byteLength, const Sk
}
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;
@@ -892,6 +895,7 @@ void SkGPipeCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const
if (matrix) {
fWriter.writeMatrix(*matrix);
}
+ fWriter.write32(method);
}
}
}

Powered by Google App Engine
This is Rietveld 408576698