Track nested picture xform state for layer hoisting

src/gpu/GrPictureUtils.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 "GrPictureUtils.h"
 
 #include "SkPaintPriv.h"
@@ skipping 106 matching lines @@
 
             this->updateStackForSaveLayer();
 
             GrAccelData::SaveLayerInfo& dst = fAccelData->addSaveLayerInfo();
 
             // If src.fPicture is NULL the layer is in dp.picture; otherwise
             // it belongs to a sub-picture.
             dst.fPicture = src.fPicture ? src.fPicture : static_cast<const SkPicture*>(dp.picture);
             dst.fPicture->ref();
             dst.fBounds = newClip;
-            dst.fOriginXform = src.fOriginXform;
-            dst.fOriginXform.postConcat(*fCTM);
+            dst.fLocalMat = src.fLocalMat;
+            dst.fPreMat = src.fPreMat;
+            dst.fPreMat.preConcat(*fCTM);
             if (src.fPaint) {
                 dst.fPaint = SkNEW_ARGS(SkPaint, (*src.fPaint));
             }
             dst.fSaveLayerOpID = src.fSaveLayerOpID;
             dst.fRestoreOpID = src.fRestoreOpID;
             dst.fHasNestedLayers = src.fHasNestedLayers;
             dst.fIsNested = fSaveLayersInStack > 0 || src.fIsNested;
         }
     }
 
@@ skipping 34 matching lines @@
         if (!si.fIsSaveLayer) {
             return;
         }
 
         --fSaveLayersInStack;
 
         GrAccelData::SaveLayerInfo& slInfo = fAccelData->addSaveLayerInfo();
 
         SkASSERT(NULL == slInfo.fPicture);  // This layer is in the top-most picture
         slInfo.fBounds = si.fBounds;
-        slInfo.fOriginXform = *fCTM;
+        slInfo.fLocalMat = *fCTM;
+        slInfo.fPreMat = SkMatrix::I();
         if (si.fPaint) {
             slInfo.fPaint = SkNEW_ARGS(SkPaint, (*si.fPaint));
         }
         slInfo.fSaveLayerOpID = si.fStartIndex;
         slInfo.fRestoreOpID = fCurrentOp;
         slInfo.fHasNestedLayers = si.fHasNestedSaveLayer;
         slInfo.fIsNested = fSaveLayersInStack > 0;
     }
 
     // Returns true if rect was meaningfully adjusted for the effects of paint,
@@ skipping 57 matching lines @@
     }
 
     SkAutoTUnref<GrAccelData> data(SkNEW_ARGS(GrAccelData, (key)));
 
     pict->EXPERIMENTAL_addAccelData(data);
 
     CollectLayers collector(pict, data);
 
     return data;
 }