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 /src/utils/SkDumpCanvas.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/utils/SkDumpCanvas.cpp')
-rw-r--r-- | src/utils/SkDumpCanvas.cpp | 69 |
1 files changed, 51 insertions, 18 deletions
diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp index 1bfb1ba806..54ca691dce 100644 --- a/src/utils/SkDumpCanvas.cpp +++ b/src/utils/SkDumpCanvas.cpp @@ -294,29 +294,29 @@ void SkDumpCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) { /////////////////////////////////////////////////////////////////////////////// -void SkDumpCanvas::drawPaint(const SkPaint& paint) { +void SkDumpCanvas::onDrawPaint(const SkPaint& paint) { this->dump(kDrawPaint_Verb, &paint, "drawPaint()"); } -void SkDumpCanvas::drawPoints(PointMode mode, size_t count, +void SkDumpCanvas::onDrawPoints(PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint) { this->dump(kDrawPoints_Verb, &paint, "drawPoints(%s, %d)", toString(mode), count); } -void SkDumpCanvas::drawOval(const SkRect& rect, const SkPaint& paint) { +void SkDumpCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) { SkString str; toString(rect, &str); this->dump(kDrawOval_Verb, &paint, "drawOval(%s)", str.c_str()); } -void SkDumpCanvas::drawRect(const SkRect& rect, const SkPaint& paint) { +void SkDumpCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) { SkString str; toString(rect, &str); this->dump(kDrawRect_Verb, &paint, "drawRect(%s)", str.c_str()); } -void SkDumpCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { +void SkDumpCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) { SkString str; toString(rrect, &str); this->dump(kDrawDRRect_Verb, &paint, "drawRRect(%s)", str.c_str()); @@ -331,23 +331,22 @@ void SkDumpCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner, str0.c_str(), str1.c_str()); } -void SkDumpCanvas::drawPath(const SkPath& path, const SkPaint& paint) { +void SkDumpCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { SkString str; toString(path, &str); this->dump(kDrawPath_Verb, &paint, "drawPath(%s)", str.c_str()); } -void SkDumpCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, - const SkPaint* paint) { +void SkDumpCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, + const SkPaint* paint) { SkString str; bitmap.toString(&str); this->dump(kDrawBitmap_Verb, paint, "drawBitmap(%s %g %g)", str.c_str(), SkScalarToFloat(x), SkScalarToFloat(y)); } -void SkDumpCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, - const SkRect& dst, const SkPaint* paint, - DrawBitmapRectFlags flags) { +void SkDumpCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, + const SkPaint* paint, DrawBitmapRectFlags flags) { SkString bs, rs; bitmap.toString(&bs); toString(dst, &rs); @@ -364,8 +363,42 @@ void SkDumpCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* sr bs.c_str(), rs.c_str()); } -void SkDumpCanvas::drawSprite(const SkBitmap& bitmap, int x, int y, - const SkPaint* paint) { +void SkDumpCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, + const SkRect& dst, const SkPaint* paint) { + SkString str, centerStr, dstStr; + bitmap.toString(&str); + toString(center, ¢erStr); + toString(dst, &dstStr); + this->dump(kDrawBitmap_Verb, paint, "drawBitmapNine(%s %s %s)", str.c_str(), + centerStr.c_str(), dstStr.c_str()); +} + +void SkDumpCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) { + SkString str; + image->toString(&str); + this->dump(kDrawBitmap_Verb, paint, "drawImage(%s %g %g)", str.c_str(), + SkScalarToFloat(x), SkScalarToFloat(y)); +} + +void SkDumpCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, + const SkPaint* paint) { + SkString bs, rs; + image->toString(&bs); + toString(dst, &rs); + // show the src-rect only if its not everything + if (src && (src->fLeft > 0 || src->fTop > 0 || + src->fRight < SkIntToScalar(image->width()) || + src->fBottom < SkIntToScalar(image->height()))) { + SkString ss; + toString(*src, &ss); + rs.prependf("%s ", ss.c_str()); + } + + this->dump(kDrawBitmap_Verb, paint, "drawImageRectToRect(%s %s)", + bs.c_str(), rs.c_str()); +} + +void SkDumpCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* paint) { SkString str; bitmap.toString(&str); this->dump(kDrawBitmap_Verb, paint, "drawSprite(%s %d %d)", str.c_str(), @@ -427,11 +460,11 @@ void SkDumpCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matri picture->cullRect().fRight, picture->cullRect().fBottom); } -void SkDumpCanvas::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) { +void SkDumpCanvas::onDrawVertices(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->dump(kDrawVertices_Verb, &paint, "drawVertices(%s [%d] %g %g ...)", toString(vmode), vertexCount, SkScalarToFloat(vertices[0].fX), SkScalarToFloat(vertices[0].fY)); |