Track nested picture xform state for layer hoisting

src/gpu/GrPictureUtils.cpp

Index: src/gpu/GrPictureUtils.cpp
diff --git a/src/gpu/GrPictureUtils.cpp b/src/gpu/GrPictureUtils.cpp
index a215a0e7a6492e6ae908a46bc32e109432749cfa..f3c63047b92530e64c77de6499321b2929d780dc 100644
--- a/src/gpu/GrPictureUtils.cpp
+++ b/src/gpu/GrPictureUtils.cpp
@@ -124,8 +124,9 @@ private:
             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.fInitialMat = src.fInitialMat;
+            dst.fInitialMat.preConcat(*fCTM);

[jvanverth1, 2014/10/21 18:40:04]

Not postConcat?

[robertphillips, 2014/10/21 19:54:46]

I believe preConcat is correct. fCTM is the CTM of the current picture while
src.fPreMat is the prefix matrix of the arbitrarily nested child picture. I
would expect the true CTM of the child saveLayer to be: fCTM * src.fPreMat *
src.fLocalMat.

             if (src.fPaint) {
                 dst.fPaint = SkNEW_ARGS(SkPaint, (*src.fPaint));
             }
@@ -180,7 +181,8 @@ private:
 
         SkASSERT(NULL == slInfo.fPicture);  // This layer is in the top-most picture
         slInfo.fBounds = si.fBounds;
-        slInfo.fOriginXform = *fCTM;
+        slInfo.fLocalMat = *fCTM;
+        slInfo.fInitialMat = SkMatrix::I();
         if (si.fPaint) {
             slInfo.fPaint = SkNEW_ARGS(SkPaint, (*si.fPaint));
         }