diff options
| author |  reed <reed@google.com> | 2015-01-05 07:49:08 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-05 07:49:08 -0800 |
| commit | 41af966ab338e95eee81ab618ab28195075338f7 (patch) | |
| tree | e11def4f93345bfb4204d20f6f28fc7a2fecda1a /tests/RecordDrawTest.cpp | |
| parent | 49aabde6ef80e39f00a2d00487cf5a881987dd81 (diff) | |
Revert of Revert of move remaining virtual draw methods to onDraw (patchset #1 id:1 of https://codereview.chromium.org/835913002/)
Reason for revert:
test to see if it wasn't this CL that broke chromeos
Original issue's description:
> 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:
>
> Committed: https://skia.googlesource.com/skia/+/e87e383351e1547b21d96d02bcd0c3cbbe0837f1
TBR=robertphillips@google.com,djsollen@google.com,bsalomon@google.com,mtklein@google.com,reed@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/831253002
Diffstat (limited to 'tests/RecordDrawTest.cpp')
| -rw-r--r-- | tests/RecordDrawTest.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp index d306cad6e9..ec3680c3a9 100644 --- a/tests/RecordDrawTest.cpp +++ b/tests/RecordDrawTest.cpp @@ -288,16 +288,14 @@ 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; } - virtual void drawImageRect(const SkImage* image, const SkRect* src, - const SkRect& dst, - const SkPaint* paint = NULL) SK_OVERRIDE { + void onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, + const SkPaint* paint) SK_OVERRIDE { fDrawImageRectCalled = true; } |