From 7ce564cccb246ec56427085872b2e1458fe74bd1 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 22 Oct 2013 16:54:15 +0000 Subject: Revert "If the path is a rect, call drawRect to raster the geometry in SkCanvas::drawPath to get better performance." This reverts commit r11904 Review URL: https://codereview.chromium.org/35543002 git-svn-id: http://skia.googlecode.com/svn/trunk@11909 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/utils/debugger/SkDebugCanvas.cpp | 4 ++-- src/utils/debugger/SkDebugCanvas.h | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/utils/debugger') diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index 41d268368d..53b531cf2d 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -363,7 +363,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)); } @@ -387,7 +387,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 93444ac10b..7d1166286a 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -189,6 +189,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[], @@ -201,6 +203,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, @@ -238,11 +242,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 fCommandVector; int fHeight; -- cgit v1.2.3