Allow previously-hoisted layers to be reused in the same draw

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 108 matching lines @@
             newClip.intersect(this->adjustAndMap(srcRect, dp.paint));
 
             GrAccelData::SaveLayerInfo& dst = fAccelData->addSaveLayerInfo();
 
             dst.fValid = true;
             // 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.fSize = SkISize::Make(newClip.width(), newClip.height());
             dst.fOffset = SkIPoint::Make(newClip.fLeft, newClip.fTop);

[robertphillips, 2014/09/30 17:44:40]

This is just a minor bug fix. I got the order wrong the first time around.

-            dst.fOriginXform = *fCTM;
-            dst.fOriginXform.postConcat(src.fOriginXform);
+            dst.fOriginXform = src.fOriginXform;
+            dst.fOriginXform.postConcat(*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 114 matching lines @@
     }
 
     SkAutoTUnref<GrAccelData> data(SkNEW_ARGS(GrAccelData, (key)));
 
     pict->EXPERIMENTAL_addAccelData(data);
 
     CollectLayers collector(pict, data);
 
     return data;
 }