diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-18 15:14:33 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-18 15:14:33 +0000 |
| commit | 7112173c3c4cd1b1e7da8cdf971d71f01dd91299 (patch) | |
| tree | 854ffd9e48edda9dd70b2f7ad3d788000b8f7def /debugger | |
| parent | acfb30e5bb797249f4ec41edda4c4d4b86e0e5d0 (diff) | |
re-re-land 5578
will follow w/ new .skp files to keep the waterfall green (I hope)
git-svn-id: http://skia.googlecode.com/svn/trunk@5584 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/SkDebugCanvas.cpp | 4 | ||||
| -rw-r--r-- | debugger/SkDebugCanvas.h | 4 | ||||
| -rw-r--r-- | debugger/SkDrawCommand.cpp | 4 | ||||
| -rw-r--r-- | debugger/SkDrawCommand.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/debugger/SkDebugCanvas.cpp b/debugger/SkDebugCanvas.cpp index 6fda8b0f24..db9154e15b 100644 --- a/debugger/SkDebugCanvas.cpp +++ b/debugger/SkDebugCanvas.cpp @@ -183,8 +183,8 @@ void SkDebugCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left, addDrawCommand(new DrawBitmap(bitmap, left, top, paint)); } -void SkDebugCanvas::drawBitmapRect(const SkBitmap& bitmap, - const SkIRect* src, const SkRect& dst, const SkPaint* paint) { +void SkDebugCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, + const SkRect* src, const SkRect& dst, const SkPaint* paint) { addDrawCommand(new DrawBitmapRect(bitmap, src, dst, paint)); } diff --git a/debugger/SkDebugCanvas.h b/debugger/SkDebugCanvas.h index 28340109fa..5172bc23f5 100644 --- a/debugger/SkDebugCanvas.h +++ b/debugger/SkDebugCanvas.h @@ -135,8 +135,8 @@ public: virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; - virtual void drawBitmapRect(const SkBitmap&, const SkIRect* src, - const SkRect& dst, const SkPaint*) SK_OVERRIDE; + virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src, + const SkRect& dst, const SkPaint*) SK_OVERRIDE; virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&, const SkPaint*) SK_OVERRIDE; diff --git a/debugger/SkDrawCommand.cpp b/debugger/SkDrawCommand.cpp index 00ea535a58..7d9eaea6e4 100644 --- a/debugger/SkDrawCommand.cpp +++ b/debugger/SkDrawCommand.cpp @@ -180,7 +180,7 @@ void DrawBitmapNine::execute(SkCanvas* canvas) { canvas->drawBitmapNine(*this->fBitmap, *this->fCenter, *this->fDst, this->fPaint); } -DrawBitmapRect::DrawBitmapRect(const SkBitmap& bitmap, const SkIRect* src, +DrawBitmapRect::DrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, const SkPaint* paint) { this->fBitmap = &bitmap; this->fSrc = src; @@ -189,7 +189,7 @@ DrawBitmapRect::DrawBitmapRect(const SkBitmap& bitmap, const SkIRect* src, this->fDrawType = DRAW_BITMAP_RECT; this->fInfo.push(SkObjectParser::BitmapToString(bitmap)); - if (src) this->fInfo.push(SkObjectParser::IRectToString(*src)); + if (src) this->fInfo.push(SkObjectParser::RectToString(*src)); this->fInfo.push(SkObjectParser::RectToString(dst)); if (paint) this->fInfo.push(SkObjectParser::PaintToString(*paint)); } diff --git a/debugger/SkDrawCommand.h b/debugger/SkDrawCommand.h index 33b735e51e..3334209bd0 100644 --- a/debugger/SkDrawCommand.h +++ b/debugger/SkDrawCommand.h @@ -134,11 +134,11 @@ private: class DrawBitmapRect : public SkDrawCommand { public: - DrawBitmapRect(const SkBitmap& bitmap, const SkIRect* src, + DrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, const SkPaint* paint); virtual void execute(SkCanvas* canvas) SK_OVERRIDE; private: - const SkIRect* fSrc; + const SkRect* fSrc; const SkPaint* fPaint; const SkBitmap* fBitmap; const SkRect* fDst; |