Force SkMatrix type while recording too.

src/gpu/GrRecordReplaceDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrRecordReplaceDraw.h"
 #include "SkCanvasPriv.h"
 #include "SkImage.h"
 #include "SkRecordDraw.h"
 #include "SkRecords.h"
 
 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;
 }
 
 void GrReplacements::freeAll() {
     SkTDynamicHash<ReplacementInfo, ReplacementInfo::Key>::Iter iter(&fReplacementHash);
 
     for (; !iter.done(); ++iter) {
         ReplacementInfo* replacement = &(*iter);
@@ skipping 99 matching lines @@
 
         int drawPictureOffset;
         if (fOps.count()) {
             drawPictureOffset = fOps[fIndex];
         } else {
             drawPictureOffset = fIndex;
         }
 
         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(),
                          fTopLevelPicture, dp.picture, fReplacements, fInitialMatrix, fCallback,
                          fOpIndexStack.begin(), fOpIndexStack.count());
 
         fNumReplaced += draw.draw();
 
         fOpIndexStack.pop();
     }
@@ skipping 57 matching lines @@
 };
 
 int GrRecordReplaceDraw(const SkPicture* picture,
                         SkCanvas* canvas,
                         const GrReplacements* replacements,
                         const SkMatrix& initialMatrix,
                         SkDrawPictureCallback* callback) {
     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();
 }