Fix a problem with hiDPI filters vs tiled SkPicture playback.

src/core/SkPictureStateTree.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureStateTree.h"
 #include "SkCanvas.h"
@@ skipping 85 matching lines @@
     , fCurrentMatrix(NULL)
     , fPlaybackIndex(0)
     , fSave(false)
     , fValid(true) {
 }
 
 uint32_t SkPictureStateTree::Iterator::draw() {
     SkASSERT(this->isValid());
     if (fPlaybackIndex >= fDraws->count()) {
         // restore back to where we started
+        fCanvas->setMatrix(fPlaybackMatrix);
         if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) { fCanvas->restore(); }
         fCurrentNode = fCurrentNode->fParent;
         while (NULL != fCurrentNode) {
             if (fCurrentNode->fFlags & Node::kSave_Flag) { fCanvas->restore(); }
             if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) { fCanvas->restore(); }
             fCurrentNode = fCurrentNode->fParent;
         }
-        fCanvas->setMatrix(fPlaybackMatrix);
         return kDrawComplete;
     }
 
     Draw* draw = static_cast<Draw*>((*fDraws)[fPlaybackIndex]);
     Node* targetNode = draw->fNode;
 
     if (fSave) {
         fCanvas->save(SkCanvas::kClip_SaveFlag);
         fSave = false;
     }
@@ skipping 53 matching lines @@
     if (fCurrentMatrix != draw->fMatrix) {
         SkMatrix tmp = *draw->fMatrix;
         tmp.postConcat(fPlaybackMatrix);
         fCanvas->setMatrix(tmp);
         fCurrentMatrix = draw->fMatrix;
     }
 
     ++fPlaybackIndex;
     return draw->fOffset;
 }