Fix sub-picture layer rendering bugs

src/gpu/GrLayerHoister.cpp

Index: src/gpu/GrLayerHoister.cpp
diff --git a/src/gpu/GrLayerHoister.cpp b/src/gpu/GrLayerHoister.cpp
index 8143bdc375abbab8bf7ff294104f843b9e525b7c..07effc562d048028623e5e927e5ca57469072ece 100644
--- a/src/gpu/GrLayerHoister.cpp
+++ b/src/gpu/GrLayerHoister.cpp
@@ -135,9 +135,12 @@ static void convert_layers_to_replacements(const SkTDArray<GrLayerHoister::Hoist
     // TODO: just replace GrReplacements::ReplacementInfo with GrCachedLayer?
     for (int i = 0; i < layers.count(); ++i) {
         GrCachedLayer* layer = layers[i].fLayer;
+        const SkPicture* picture = layers[i].fPicture;
 
-        GrReplacements::ReplacementInfo* layerInfo = replacements->push();
-        layerInfo->fStart = layer->start();
+        GrReplacements::ReplacementInfo* layerInfo =
+                            replacements->newReplacement(picture->uniqueID(), 
+                                                         layer->start(),
+                                                         layers[i].fCTM);
         layerInfo->fStop = layer->stop();
         layerInfo->fPos = layers[i].fOffset;