Expose layer hoisting API in GrContext

src/gpu/SkGpuDevice.cpp

Index: src/gpu/SkGpuDevice.cpp
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 22968a781305a82ef59049d7a22b52ed5838ec49..f1334453c89fb488aeff20001db9b0688403df58 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1834,17 +1834,15 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture
         return false;
     }
 
-    fContext->getLayerCache()->processDeletedPictures();
-
     SkRect clipBounds;
     if (!mainCanvas->getClipBounds(&clipBounds)) {
         return true;
     }
 
-    SkTDArray<GrLayerHoister::HoistedLayer> atlased, nonAtlased, recycled;
+    SkTDArray<GrHoistedLayer> atlased, nonAtlased, recycled;
 
-    if (!GrLayerHoister::FindLayersToHoist(mainPicture, clipBounds, &atlased, &nonAtlased,
-                                           &recycled, fContext->getLayerCache())) {
+    if (!GrLayerHoister::FindLayersToHoist(fContext, mainPicture, clipBounds, 
+                                           &atlased, &nonAtlased, &recycled)) {
         return false;
     }
 
@@ -1857,7 +1855,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture
 
     GrRecordReplaceDraw(mainPicture, mainCanvas, &replacements, initialMatrix, NULL);
 
-    GrLayerHoister::UnlockLayers(fContext->getLayerCache(), atlased, nonAtlased, recycled);
+    GrLayerHoister::UnlockLayers(fContext, atlased, nonAtlased, recycled);
 
     return true;
 }