From c2cc1dbe818c8a5a699fbe18c4fc79b9d93daa94 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 17 Oct 2013 17:34:20 +0000 Subject: 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 --- experimental/PdfViewer/SkNulCanvas.h | 4 ++-- experimental/SimpleCocoaApp/SimpleApp.mm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'experimental') diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h index c43ea82918..8ec2d32d0f 100644 --- a/experimental/PdfViewer/SkNulCanvas.h +++ b/experimental/PdfViewer/SkNulCanvas.h @@ -55,8 +55,10 @@ public: virtual void drawPaint(const SkPaint& paint) {} virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint) {} + virtual void drawRect(const SkRect& rect, const SkPaint& paint) {} virtual void drawOval(const SkRect& oval, const SkPaint&) {} virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) {} + virtual void drawPath(const SkPath& path, const SkPaint& paint) {} virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, const SkPaint* paint = NULL) {} virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, @@ -93,8 +95,6 @@ public: virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) {return NULL;} protected: - virtual void onDrawRect(const SkRect& rect, const SkPaint& paint) {} - virtual void onDrawPath(const SkPath& path, const SkPaint& paint) {} virtual SkCanvas* canvasForDrawIter() {return NULL;} virtual SkBaseDevice* setDevice(SkBaseDevice* device) {return NULL;} diff --git a/experimental/SimpleCocoaApp/SimpleApp.mm b/experimental/SimpleCocoaApp/SimpleApp.mm index 2156209798..7dac2a4fff 100644 --- a/experimental/SimpleCocoaApp/SimpleApp.mm +++ b/experimental/SimpleCocoaApp/SimpleApp.mm @@ -135,7 +135,7 @@ static int showPathContour(SkPath::Iter& iter) { } class PathCanvas : public SkCanvas { - virtual void onDrawPath(const SkPath& path, const SkPaint& paint) { + virtual void drawPath(const SkPath& path, const SkPaint& paint) { if (nameonly) { SkDebugf(" %s%d,\n", filename.c_str(), ++count); return; -- cgit v1.2.3