commit 53ec73d1e663c781cf44def060b5e8f669709fdc
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 26 13:09:17 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 26 13:09:17 2012 +0000
tree 8ba147e906f04c261c0cb4fe6a6936b31b0c9b2b
parent 1c9c0d37111e6ff7a74a2908bf62a0d3954f2bb5

Visualize bitmaps in debugger

https://codereview.appspot.com/6847084/



git-svn-id: http://skia.googlecode.com/svn/trunk@6541 2bbb7eff-a529-9590-31e7-b0007b416f81

debugger/SkDrawCommand.cpp

diff --git a/debugger/SkDrawCommand.cpp b/debugger/SkDrawCommand.cpp
index 45aaaf2..5973ca8 100644
--- a/debugger/SkDrawCommand.cpp
+++ b/debugger/SkDrawCommand.cpp
@@ -135,12 +135,13 @@
 }
 
 DrawBitmap::DrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-        const SkPaint* paint) {
+        const SkPaint* paint, SkBitmap& resizedBitmap) {
     this->fBitmap = &bitmap;
     this->fLeft = left;
     this->fTop = top;
     this->fPaint = paint;
     this->fDrawType = DRAW_BITMAP;
+    this->fResizedBitmap = resizedBitmap;
 
     this->fInfo.push(SkObjectParser::BitmapToString(bitmap));
     this->fInfo.push(SkObjectParser::ScalarToString(left, "SkScalar left: "));
@@ -151,12 +152,17 @@
     canvas->drawBitmap(*this->fBitmap, this->fLeft, this->fTop, this->fPaint);
 }
 
+const SkBitmap* DrawBitmap::getBitmap() const {
+    return &fResizedBitmap;
+}
+
 DrawBitmapMatrix::DrawBitmapMatrix(const SkBitmap& bitmap,
-        const SkMatrix& matrix, const SkPaint* paint) {
+        const SkMatrix& matrix, const SkPaint* paint, SkBitmap& resizedBitmap) {
     this->fBitmap = &bitmap;
     this->fMatrix = &matrix;
     this->fPaint = paint;
     this->fDrawType = DRAW_BITMAP_MATRIX;
+    this->fResizedBitmap = resizedBitmap;
 
     this->fInfo.push(SkObjectParser::BitmapToString(bitmap));
     this->fInfo.push(SkObjectParser::MatrixToString(matrix));
@@ -167,13 +173,18 @@
     canvas->drawBitmapMatrix(*this->fBitmap, *this->fMatrix, this->fPaint);
 }
 
+const SkBitmap* DrawBitmapMatrix::getBitmap() const {
+    return &fResizedBitmap;
+}
+
 DrawBitmapNine::DrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-        const SkRect& dst, const SkPaint* paint) {
+        const SkRect& dst, const SkPaint* paint, SkBitmap& resizedBitmap) {
     this->fBitmap = &bitmap;
     this->fCenter = &center;
     this->fDst = &dst;
     this->fPaint = paint;
     this->fDrawType = DRAW_BITMAP_NINE;
+    this->fResizedBitmap = resizedBitmap;
 
     this->fInfo.push(SkObjectParser::BitmapToString(bitmap));
     this->fInfo.push(SkObjectParser::IRectToString(center));
@@ -185,13 +196,18 @@
     canvas->drawBitmapNine(*this->fBitmap, *this->fCenter, *this->fDst, this->fPaint);
 }
 
+const SkBitmap* DrawBitmapNine::getBitmap() const {
+    return &fResizedBitmap;
+}
+
 DrawBitmapRect::DrawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
-        const SkRect& dst, const SkPaint* paint) {
+        const SkRect& dst, const SkPaint* paint, SkBitmap& resizedBitmap) {
     this->fBitmap = &bitmap;
     this->fSrc = src;
     this->fDst = &dst;
     this->fPaint = paint;
     this->fDrawType = DRAW_BITMAP_RECT_TO_RECT;
+    this->fResizedBitmap = resizedBitmap;
 
     this->fInfo.push(SkObjectParser::BitmapToString(bitmap));
     if (src) this->fInfo.push(SkObjectParser::RectToString(*src, "Src: "));
@@ -203,6 +219,10 @@
     canvas->drawBitmapRectToRect(*this->fBitmap, this->fSrc, *this->fDst, this->fPaint);
 }
 
+const SkBitmap* DrawBitmapRect::getBitmap() const {
+    return &fResizedBitmap;
+}
+
 DrawData::DrawData(const void* data, size_t length) {
     this->fData = data;
     this->fLength = length;
@@ -324,12 +344,13 @@
 }
 
 DrawSprite::DrawSprite(const SkBitmap& bitmap, int left, int top,
-        const SkPaint* paint) {
+        const SkPaint* paint, SkBitmap& resizedBitmap) {
     this->fBitmap = &bitmap;
     this->fLeft = left;
     this->fTop = top;
     this->fPaint = paint;
     this->fDrawType = DRAW_SPRITE;
+    this->fResizedBitmap = resizedBitmap;
 
     this->fInfo.push(SkObjectParser::BitmapToString(bitmap));
     this->fInfo.push(SkObjectParser::IntToString(left, "Left: "));
@@ -340,6 +361,10 @@
     canvas->drawSprite(*this->fBitmap, this->fLeft, this->fTop, this->fPaint);
 }
 
+const SkBitmap* DrawSprite::getBitmap() const {
+    return &fResizedBitmap;
+}
+
 DrawTextC::DrawTextC(const void* text, size_t byteLength, SkScalar x, SkScalar y,
         const SkPaint& paint) {
     this->fText = text;