diff options
author | 2015-01-05 07:49:08 -0800 | |
---|---|---|
committer | 2015-01-05 07:49:08 -0800 | |
commit | 41af966ab338e95eee81ab618ab28195075338f7 (patch) | |
tree | e11def4f93345bfb4204d20f6f28fc7a2fecda1a /src/core/SkCanvas.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 'src/core/SkCanvas.cpp')
-rw-r--r-- | src/core/SkCanvas.cpp | 109 |
1 files changed, 82 insertions, 27 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 09b9783cb9..13b84e7f0f 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1196,8 +1196,7 @@ void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y, LOOPER_END } -void SkCanvas::drawSprite(const SkBitmap& bitmap, int x, int y, - const SkPaint* paint) { +void SkCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* paint) { if (gTreatSpriteAsBitmap) { this->save(); this->resetMatrix(); @@ -1671,6 +1670,66 @@ void SkCanvas::drawDRRect(const SkRRect& outer, const SkRRect& inner, this->onDrawDRRect(outer, inner, paint); } +// These need to stop being virtual -- clients need to override the onDraw... versions + +void SkCanvas::drawPaint(const SkPaint& paint) { + this->onDrawPaint(paint); +} + +void SkCanvas::drawRect(const SkRect& r, const SkPaint& paint) { + this->onDrawRect(r, paint); +} + +void SkCanvas::drawOval(const SkRect& r, const SkPaint& paint) { + this->onDrawOval(r, paint); +} + +void SkCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { + this->onDrawRRect(rrect, paint); +} + +void SkCanvas::drawPoints(PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint) { + this->onDrawPoints(mode, count, pts, paint); +} + +void SkCanvas::drawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], + const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, + const uint16_t indices[], int indexCount, const SkPaint& paint) { + this->onDrawVertices(vmode, vertexCount, vertices, texs, colors, xmode, + indices, indexCount, paint); +} + +void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) { + this->onDrawPath(path, paint); +} + +void SkCanvas::drawImage(const SkImage* image, SkScalar dx, SkScalar dy, const SkPaint* paint) { + this->onDrawImage(image, dx, dy, paint); +} + +void SkCanvas::drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, + const SkPaint* paint) { + this->onDrawImageRect(image, src, dst, paint); +} + +void SkCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar dx, SkScalar dy, const SkPaint* paint) { + this->onDrawBitmap(bitmap, dx, dy, paint); +} + +void SkCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, + const SkPaint* paint, DrawBitmapRectFlags flags) { + this->onDrawBitmapRect(bitmap, src, dst, paint, flags); +} + +void SkCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst, + const SkPaint* paint) { + this->onDrawBitmapNine(bitmap, center, dst, paint); +} + +void SkCanvas::drawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint) { + this->onDrawSprite(bitmap, left, top, paint); +} + ////////////////////////////////////////////////////////////////////////////// // These are the virtual drawing methods ////////////////////////////////////////////////////////////////////////////// @@ -1681,7 +1740,7 @@ void SkCanvas::onDiscard() { } } -void SkCanvas::drawPaint(const SkPaint& paint) { +void SkCanvas::onDrawPaint(const SkPaint& paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPaint()"); this->internalDrawPaint(paint); } @@ -1696,8 +1755,8 @@ void SkCanvas::internalDrawPaint(const SkPaint& paint) { LOOPER_END } -void SkCanvas::drawPoints(PointMode mode, size_t count, const SkPoint pts[], - const SkPaint& paint) { +void SkCanvas::onDrawPoints(PointMode mode, size_t count, const SkPoint pts[], + const SkPaint& paint) { TRACE_EVENT1("disabled-by-default-skia", "SkCanvas::drawPoints()", "count", static_cast<uint64_t>(count)); if ((long)count <= 0) { return; @@ -1729,7 +1788,7 @@ void SkCanvas::drawPoints(PointMode mode, size_t count, const SkPoint pts[], LOOPER_END } -void SkCanvas::drawRect(const SkRect& r, const SkPaint& paint) { +void SkCanvas::onDrawRect(const SkRect& r, const SkPaint& paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRect()"); SkRect storage; const SkRect* bounds = NULL; @@ -1749,7 +1808,7 @@ void SkCanvas::drawRect(const SkRect& r, const SkPaint& paint) { LOOPER_END } -void SkCanvas::drawOval(const SkRect& oval, const SkPaint& paint) { +void SkCanvas::onDrawOval(const SkRect& oval, const SkPaint& paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawOval()"); SkRect storage; const SkRect* bounds = NULL; @@ -1769,7 +1828,7 @@ void SkCanvas::drawOval(const SkRect& oval, const SkPaint& paint) { LOOPER_END } -void SkCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { +void SkCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRRect()"); SkRect storage; const SkRect* bounds = NULL; @@ -1819,7 +1878,7 @@ void SkCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner, LOOPER_END } -void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) { +void SkCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPath()"); if (!path.isFinite()) { return; @@ -1852,21 +1911,18 @@ void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) { LOOPER_END } -void SkCanvas::drawImage(const SkImage* image, SkScalar left, SkScalar top, - const SkPaint* paint) { +void SkCanvas::onDrawImage(const SkImage* image, SkScalar dx, SkScalar dy, const SkPaint* paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImage()"); - image->draw(this, left, top, paint); + image->draw(this, dx, dy, paint); } -void SkCanvas::drawImageRect(const SkImage* image, const SkRect* src, - const SkRect& dst, - const SkPaint* paint) { +void SkCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, + const SkPaint* paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImageRect()"); image->drawRect(this, src, dst, paint); } -void SkCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, - const SkPaint* paint) { +void SkCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, const SkPaint* paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawBitmap()"); SkDEBUGCODE(bitmap.validate();) @@ -1922,9 +1978,8 @@ void SkCanvas::internalDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, LOOPER_END } -void SkCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, - const SkRect& dst, const SkPaint* paint, - DrawBitmapRectFlags flags) { +void SkCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, + const SkPaint* paint, DrawBitmapRectFlags flags) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawBitmapRectToRect()"); SkDEBUGCODE(bitmap.validate();) this->internalDrawBitmapRect(bitmap, src, dst, paint, flags); @@ -2000,8 +2055,8 @@ void SkCanvas::internalDrawBitmapNine(const SkBitmap& bitmap, } } -void SkCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, - const SkRect& dst, const SkPaint* paint) { +void SkCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst, + const SkPaint* paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawBitmapNine()"); SkDEBUGCODE(bitmap.validate();) @@ -2208,11 +2263,11 @@ void SkCanvas::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, } } -void SkCanvas::drawVertices(VertexMode vmode, int vertexCount, - const SkPoint verts[], const SkPoint texs[], - const SkColor colors[], SkXfermode* xmode, - const uint16_t indices[], int indexCount, - const SkPaint& paint) { +void SkCanvas::onDrawVertices(VertexMode vmode, int vertexCount, + const SkPoint verts[], const SkPoint texs[], + const SkColor colors[], SkXfermode* xmode, + const uint16_t indices[], int indexCount, + const SkPaint& paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawVertices()"); LOOPER_BEGIN(paint, SkDrawFilter::kPath_Type, NULL) |