Index: src/pipe/SkGPipeWrite.cpp |
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp |
index f14cdacc9b21f03a3492bb505b3726e5a5499d94..57d4a0fdc345ee57263420a44fb08ae19e7d6783 100644 |
--- a/src/pipe/SkGPipeWrite.cpp |
+++ b/src/pipe/SkGPipeWrite.cpp |
@@ -224,7 +224,9 @@ public: |
virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], |
const SkPaint&) SK_OVERRIDE; |
virtual void drawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; |
+ virtual void drawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE; |
virtual void drawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; |
+ virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE; |
virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top, |
const SkPaint*) SK_OVERRIDE; |
virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src, |
@@ -262,11 +264,6 @@ public: |
* according to slot. |
*/ |
bool shuttleBitmap(const SkBitmap&, int32_t slot); |
- |
-protected: |
- virtual void onDrawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE; |
- virtual void onDrawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE; |
- |
private: |
enum { |
kNoSaveLayer = -1, |
@@ -718,7 +715,7 @@ void SkGPipeCanvas::drawOval(const SkRect& rect, const SkPaint& paint) { |
} |
} |
-void SkGPipeCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) { |
+void SkGPipeCanvas::drawRect(const SkRect& rect, const SkPaint& paint) { |
NOTIFY_SETUP(this); |
this->writePaint(paint); |
if (this->needOpBytes(sizeof(SkRect))) { |
@@ -736,7 +733,7 @@ void SkGPipeCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { |
} |
} |
-void SkGPipeCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { |
+void SkGPipeCanvas::drawPath(const SkPath& path, const SkPaint& paint) { |
NOTIFY_SETUP(this); |
this->writePaint(paint); |
if (this->needOpBytes(path.writeToMemory(NULL))) { |