commit 4c7962e0a866b8416fa7046791c129eb5430b677
author chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 14 19:38:31 2012 +0000
committer chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 14 19:38:31 2012 +0000
tree 16c40d0e6c9392ea77f6090bd6408b9d30ebf8a9
parent b8ec32e050ab7151eb5660c37edf36a1119f2255

Bug Fix: Fixes transformation bug where debugger locked up during incremental draw due to nested clips not being cleared.

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

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

debugger/QT/SkDebuggerGUI.cpp

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

debugger/SkDebugCanvas.cpp

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