diff options
author | 2012-09-18 13:20:52 +0000 | |
---|---|---|
committer | 2012-09-18 13:20:52 +0000 | |
commit | c75c36a14b5dcc0dd5a82651d41792278cb27326 (patch) | |
tree | 3a844486daa7132fc317ac76e7ff8ed5b09e7db9 /debugger | |
parent | f1ab723033a186dc53434104a636c2dfac5fc863 (diff) |
revert 5578 -- broke pipe
git-svn-id: http://skia.googlecode.com/svn/trunk@5579 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 db9154e15b..6fda8b0f24 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::drawBitmapRectToRect(const SkBitmap& bitmap, - const SkRect* src, const SkRect& dst, const SkPaint* paint) { +void SkDebugCanvas::drawBitmapRect(const SkBitmap& bitmap, + const SkIRect* 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 5172bc23f5..28340109fa 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 drawBitmapRectToRect(const SkBitmap&, const SkRect* src, - const SkRect& dst, const SkPaint*) SK_OVERRIDE; + virtual void drawBitmapRect(const SkBitmap&, const SkIRect* 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 7d9eaea6e4..00ea535a58 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 SkRect* src, +DrawBitmapRect::DrawBitmapRect(const SkBitmap& bitmap, const SkIRect* src, const SkRect& dst, const SkPaint* paint) { this->fBitmap = &bitmap; this->fSrc = src; @@ -189,7 +189,7 @@ DrawBitmapRect::DrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, this->fDrawType = DRAW_BITMAP_RECT; this->fInfo.push(SkObjectParser::BitmapToString(bitmap)); - if (src) this->fInfo.push(SkObjectParser::RectToString(*src)); + if (src) this->fInfo.push(SkObjectParser::IRectToString(*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 3334209bd0..33b735e51e 100644 --- a/debugger/SkDrawCommand.h +++ b/debugger/SkDrawCommand.h @@ -134,11 +134,11 @@ private: class DrawBitmapRect : public SkDrawCommand { public: - DrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, + DrawBitmapRect(const SkBitmap& bitmap, const SkIRect* src, const SkRect& dst, const SkPaint* paint); virtual void execute(SkCanvas* canvas) SK_OVERRIDE; private: - const SkRect* fSrc; + const SkIRect* fSrc; const SkPaint* fPaint; const SkBitmap* fBitmap; const SkRect* fDst; |