From f9669f43bff92419aba11c4a33c76f3e2daf2a44 Mon Sep 17 00:00:00 2001
From: jvanverth <jvanverth@google.com>
Date: Tue, 7 Oct 2014 07:59:45 -0700
Subject: [PATCH] Fix perspective version of dftext GM

Review URL: https://codereview.chromium.org/634923002
---
 gm/dftext.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index acaffb2e1c..e36d58e845 100755
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -56,10 +56,11 @@ protected:
                              SkSurfaceProps::kLegacyFontHost_InitType);
         SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, info, 0, &props));
         SkCanvas* canvas = surface.get() ? surface->getCanvas() : inputCanvas;
+        // init our new canvas with the old canvas's matrix
+        canvas->setMatrix(inputCanvas->getTotalMatrix());
 #else
         SkCanvas* canvas = inputCanvas;
 #endif
-        
         // apply global scale to test glyph positioning
         canvas->scale(1.05f, 1.05f);
         canvas->clear(0xffffffff);
@@ -187,6 +188,9 @@ protected:
 #if SK_SUPPORT_GPU
         // render offscreen buffer
         if (surface) {
+            SkAutoCanvasRestore acr(inputCanvas, true);
+            // since we prepended this matrix already, we blit using identity
+            inputCanvas->resetMatrix();
             SkImage* image = surface->newImageSnapshot();
             inputCanvas->drawImage(image, 0, 0, NULL);
             image->unref();