change gm to use concat instead of setMatrix, so we don't trash the caller if
it was recorded into a picture.



git-svn-id: http://skia.googlecode.com/svn/trunk@4147 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 57cea7a..6eb96fd 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -277,8 +277,10 @@
 }
 
 static void invokeGM(GM* gm, SkCanvas* canvas, bool isPDF = false) {
+    SkAutoCanvasRestore acr(canvas, true);
+
     if (!isPDF) {
-        canvas->setMatrix(gm->getInitialTransform());
+        canvas->concat(gm->getInitialTransform());
     }
     installFilter(canvas);
     gm->draw(canvas);