From e87e383351e1547b21d96d02bcd0c3cbbe0837f1 Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 5 Jan 2015 04:49:38 -0800 Subject: Revert of move remaining virtual draw methods to onDraw (patchset #5 id:80001 of https://codereview.chromium.org/817723005/) Reason for revert: did this cause chromeos heap corruption on skp? Original issue's description: > move remaining virtual draw methods to onDraw > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/2e0f7d53bba5438c9bf11ee5ccae2c301e348419 TBR=robertphillips@google.com,djsollen@google.com,bsalomon@google.com,mtklein@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/835913002 --- tests/RecordDrawTest.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/RecordDrawTest.cpp') diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp index ec3680c3a9..d306cad6e9 100644 --- a/tests/RecordDrawTest.cpp +++ b/tests/RecordDrawTest.cpp @@ -288,14 +288,16 @@ DEF_TEST(RecordDraw_drawImage, r){ SkCanvasMock(int width, int height) : SkCanvas(width, height) { this->resetTestValues(); } + virtual ~SkCanvasMock() {} + virtual void drawImage(const SkImage* image, SkScalar left, SkScalar top, + const SkPaint* paint = NULL) SK_OVERRIDE { - void onDrawImage(const SkImage* image, SkScalar left, SkScalar top, - const SkPaint* paint) SK_OVERRIDE { fDrawImageCalled = true; } - void onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, - const SkPaint* paint) SK_OVERRIDE { + virtual void drawImageRect(const SkImage* image, const SkRect* src, + const SkRect& dst, + const SkPaint* paint = NULL) SK_OVERRIDE { fDrawImageRectCalled = true; } -- cgit v1.2.3