Fuse GrReplacements and GrLayerCache

src/core/SkMultiPictureDraw.cpp

Index: src/core/SkMultiPictureDraw.cpp
diff --git a/src/core/SkMultiPictureDraw.cpp b/src/core/SkMultiPictureDraw.cpp
index bd1e8fe08cce1ab2ff9b6c568c00c8f0205c0aff..ed099a02e16b741c2f9e108e9be2d2b8e356f392 100644
--- a/src/core/SkMultiPictureDraw.cpp
+++ b/src/core/SkMultiPictureDraw.cpp
@@ -15,6 +15,7 @@
 #include "SkTaskGroup.h"
 
 #if SK_SUPPORT_GPU
+#include "GrContext.h"
 #include "GrLayerHoister.h"
 #include "GrRecordReplaceDraw.h"
 #include "GrRenderTarget.h"
@@ -168,13 +169,9 @@ void SkMultiPictureDraw::draw() {
 
             GrLayerHoister::DrawLayers(context, needRendering);
 
-            GrReplacements replacements;
-
-            GrLayerHoister::ConvertLayersToReplacements(picture, needRendering, &replacements);
-            GrLayerHoister::ConvertLayersToReplacements(picture, recycled, &replacements);
-
             // Render the entire picture using new layers
-            GrRecordReplaceDraw(picture, canvas, &replacements, initialMatrix, NULL);
+            GrRecordReplaceDraw(picture, canvas, context->getLayerCache(),
+                                initialMatrix, NULL);
 
             GrLayerHoister::UnlockLayers(context, needRendering);
             GrLayerHoister::UnlockLayers(context, recycled);