Index: src/pipe/SkGPipeWrite.cpp |
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp |
index 297e613a6f0a24d466aa18e89846b2d21070a15d..6964dc140f75402ecacf412efd70d061677be125 100644 |
--- a/src/pipe/SkGPipeWrite.cpp |
+++ b/src/pipe/SkGPipeWrite.cpp |
@@ -249,6 +249,16 @@ |
const SkRect& dst, const SkPaint* paint = NULL) SK_OVERRIDE; |
virtual void drawSprite(const SkBitmap&, int left, int top, |
const SkPaint*) SK_OVERRIDE; |
+ virtual void drawText(const void* text, size_t byteLength, SkScalar x, |
+ SkScalar y, const SkPaint&) SK_OVERRIDE; |
+ virtual void drawPosText(const void* text, size_t byteLength, |
+ const SkPoint pos[], const SkPaint&) SK_OVERRIDE; |
+ virtual void drawPosTextH(const void* text, size_t byteLength, |
+ const SkScalar xpos[], SkScalar constY, |
+ const SkPaint&) SK_OVERRIDE; |
+ virtual void drawTextOnPath(const void* text, size_t byteLength, |
+ const SkPath& path, const SkMatrix* matrix, |
+ const SkPaint&) SK_OVERRIDE; |
virtual void drawPicture(SkPicture& picture) SK_OVERRIDE; |
virtual void drawVertices(VertexMode, int vertexCount, |
const SkPoint vertices[], const SkPoint texs[], |
@@ -275,14 +285,6 @@ |
virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; |
virtual 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; |
virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
@@ -848,8 +850,8 @@ |
} |
} |
-void SkGPipeCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, |
- const SkPaint& paint) { |
+void SkGPipeCanvas::drawText(const void* text, size_t byteLength, SkScalar x, |
+ SkScalar y, const SkPaint& paint) { |
if (byteLength) { |
NOTIFY_SETUP(this); |
this->writePaint(paint); |
@@ -863,8 +865,8 @@ |
} |
} |
-void SkGPipeCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], |
- const SkPaint& paint) { |
+void SkGPipeCanvas::drawPosText(const void* text, size_t byteLength, |
+ const SkPoint pos[], const SkPaint& paint) { |
if (byteLength) { |
NOTIFY_SETUP(this); |
this->writePaint(paint); |
@@ -879,8 +881,9 @@ |
} |
} |
-void SkGPipeCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], |
- SkScalar constY, const SkPaint& paint) { |
+void SkGPipeCanvas::drawPosTextH(const void* text, size_t byteLength, |
+ const SkScalar xpos[], SkScalar constY, |
+ const SkPaint& paint) { |
if (byteLength) { |
NOTIFY_SETUP(this); |
this->writePaint(paint); |
@@ -896,8 +899,9 @@ |
} |
} |
-void SkGPipeCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, |
- const SkMatrix* matrix, const SkPaint& paint) { |
+void SkGPipeCanvas::drawTextOnPath(const void* text, size_t byteLength, |
+ const SkPath& path, const SkMatrix* matrix, |
+ const SkPaint& paint) { |
if (byteLength) { |
NOTIFY_SETUP(this); |
unsigned flags = 0; |