Fuse GrReplacements and GrLayerCache

src/gpu/SkGpuDevice.cpp

Index: src/gpu/SkGpuDevice.cpp
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 9a78048aa7f139195a01c0bc0d97756319353da4..bbfec99640e763b620da3fc50f9a595afa697310 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1830,13 +1830,9 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture
 
     GrLayerHoister::DrawLayers(fContext, needRendering);
 
-    GrReplacements replacements;
-
-    GrLayerHoister::ConvertLayersToReplacements(mainPicture, needRendering, &replacements);
-    GrLayerHoister::ConvertLayersToReplacements(mainPicture, recycled, &replacements);
-
     // Render the entire picture using new layers
-    GrRecordReplaceDraw(mainPicture, mainCanvas, &replacements, initialMatrix, NULL);
+    GrRecordReplaceDraw(mainPicture, mainCanvas, fContext->getLayerCache(),
+                        initialMatrix, NULL);
 
     GrLayerHoister::UnlockLayers(fContext, needRendering);
     GrLayerHoister::UnlockLayers(fContext, recycled);