Force SkMatrix type while recording too.

src/gpu/GrRecordReplaceDraw.cpp

Index: src/gpu/GrRecordReplaceDraw.cpp
diff --git a/src/gpu/GrRecordReplaceDraw.cpp b/src/gpu/GrRecordReplaceDraw.cpp
index 9748f13701d5b1bb0c18efb234e3e7d3fd95f4f6..3701dda36e978f4bedd8827095255b1296709463 100644
--- a/src/gpu/GrRecordReplaceDraw.cpp
+++ b/src/gpu/GrRecordReplaceDraw.cpp
@@ -14,7 +14,7 @@
 GrReplacements::ReplacementInfo* GrReplacements::newReplacement(uint32_t pictureID,
                                                                 const SkMatrix& initialMat,
                                                                 const int* key, int keySize) {
-    ReplacementInfo* replacement = SkNEW_ARGS(ReplacementInfo, (pictureID, initialMat, 
+    ReplacementInfo* replacement = SkNEW_ARGS(ReplacementInfo, (pictureID, initialMat,
                                                                 key, keySize));
     fReplacementHash.add(replacement);
     return replacement;
@@ -134,7 +134,7 @@ public:
 
         fOpIndexStack.push(drawPictureOffset);
 
-        SkAutoCanvasMatrixPaint acmp(fCanvas, dp.matrix, dp.paint, dp.picture->cullRect());
+        SkAutoCanvasMatrixPaint acmp(fCanvas, &dp.matrix, dp.paint, dp.picture->cullRect());
 
         // Draw sub-pictures with the same replacement list but a different picture
         ReplaceDraw draw(fCanvas, this->drawablePicts(), this->drawableCount(),
@@ -212,8 +212,8 @@ int GrRecordReplaceDraw(const SkPicture* picture,
     SkAutoCanvasRestore saveRestore(canvas, true /*save now, restore at exit*/);
 
     // TODO: drawablePicts?
-    ReplaceDraw draw(canvas, NULL, 0, 
-                     picture, picture, 
+    ReplaceDraw draw(canvas, NULL, 0,
+                     picture, picture,
                      replacements, initialMatrix, callback, NULL, 0);
 
     return draw.draw();