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

2 files changed, 6 insertions, 7 deletions

diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index 2add91465b..bf81983548 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -321,7 +321,7 @@ void SkDebugCanvas::drawPaint(const SkPaint& paint) {
     addDrawCommand(new SkDrawPaintCommand(paint));
 }
 
-void SkDebugCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
+void SkDebugCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
     addDrawCommand(new SkDrawPathCommand(path, paint));
 }
 
@@ -345,7 +345,7 @@ void SkDebugCanvas::drawPosTextH(const void* text, size_t byteLength,
         new SkDrawPosTextHCommand(text, byteLength, xpos, constY, paint));
 }
 
-void SkDebugCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
+void SkDebugCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
     // NOTE(chudy): Messing up when renamed to DrawRect... Why?
     addDrawCommand(new SkDrawRectCommand(rect, paint));
 }
diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h
index 2b17b6ff93..705f49af83 100644
--- a/src/utils/debugger/SkDebugCanvas.h
+++ b/src/utils/debugger/SkDebugCanvas.h
@@ -182,6 +182,8 @@ public:
 
     virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
 
+    virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
+
     virtual void drawPicture(SkPicture& picture) SK_OVERRIDE;
 
     virtual void drawPoints(PointMode, size_t count, const SkPoint pts[],
@@ -194,6 +196,8 @@ public:
                               const SkScalar xpos[], SkScalar constY,
                               const SkPaint&) SK_OVERRIDE;
 
+    virtual void drawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE;
+
     virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
 
     virtual void drawSprite(const SkBitmap&, int left, int top,
@@ -231,11 +235,6 @@ public:
     static const int kVizImageHeight = 256;
     static const int kVizImageWidth = 256;
 
-protected:
-    virtual void onDrawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE;
-
-    virtual void onDrawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
-
 private:
     SkTDArray<SkDrawCommand*> fCommandVector;
     int fHeight;