Bug Fix: Fixes transformation bug where debugger locked up during incremental draw...

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

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

diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index f5c78d6..a03c878 100644 (file)
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -577,7 +577,7 @@ void SkDebuggerGUI::loadPicture(QString fileName) {
     SkPicture* picture = new SkPicture(stream);
     fCanvasWidget.resetWidgetTransform();
     fDebugger.loadPicture(picture);
-    fCanvasWidget.drawTo(fDebugger.index());
+
     SkSafeUnref(stream);
     SkSafeUnref(picture);
 

diff --git a/debugger/SkDebugCanvas.cpp b/debugger/SkDebugCanvas.cpp
index 59f982a..4751be7 100644 (file)
--- a/debugger/SkDebugCanvas.cpp
+++ b/debugger/SkDebugCanvas.cpp
@@ -89,6 +89,8 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
         i = 0;
         canvas->clear(0);
         canvas->resetMatrix();
+        SkRect rect = SkRect::MakeWH(fWidth, fHeight);
+        canvas->clipRect(rect, SkRegion::kReplace_Op );
         applyUserTransform(canvas);
     }