Decode images during deserialization in the picture debugger.

Necessary now that our checked in SKPs have encoded bitmaps in them (since https://code.google.com/p/skia/source/detail?r=6317)

Review URL: https://codereview.appspot.com/6812093

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

diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index df34891..140841d 100644 (file)
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -7,6 +7,7 @@
 
 #include "SkDebuggerGUI.h"
 #include "SkGraphics.h"
+#include "SkImageDecoder.h"
 #include <QListWidgetItem>
 
 SkDebuggerGUI::SkDebuggerGUI(QWidget *parent) :
@@ -573,8 +574,8 @@ void SkDebuggerGUI::setupDirectoryWidget() {
 
 void SkDebuggerGUI::loadPicture(QString fileName) {
     fLoading = true;
-    SkStream* stream = new SkFILEStream(fileName.toAscii());
-    SkPicture* picture = new SkPicture(stream);
+    SkStream* stream = SkNEW_ARGS(SkFILEStream, (fileName.toAscii()));
+    SkPicture* picture = SkNEW_ARGS(SkPicture, (stream, NULL, &SkImageDecoder::DecodeStream));
     fCanvasWidget.resetWidgetTransform();
     fDebugger.loadPicture(picture);