diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-17 17:34:20 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-17 17:34:20 +0000 |
| commit | c2cc1dbe818c8a5a699fbe18c4fc79b9d93daa94 (patch) | |
| tree | d9d5b8aa79d17c0a5683a70fd57f92e55de27ca2 /src/pipe/SkGPipeWrite.cpp | |
| parent | 4256d2494e80cb6c9a2db4157adc9b9daff028a6 (diff) | |
Revert r11842 (call drawRect to try GrAARectRenderer if the path is a rect - https://codereview.chromium.org/23484007) due to changes to the following GM images:
inverse_paths
pathopsinverse
git-svn-id: http://skia.googlecode.com/svn/trunk@11845 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pipe/SkGPipeWrite.cpp')
| -rw-r--r-- | src/pipe/SkGPipeWrite.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index f14cdacc9b..57d4a0fdc3 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))) { |