Alter layer hoisting to only hoist layers for one canvas at a time

src/gpu/SkGpuDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGpuDevice.h"
 
 #include "effects/GrBicubicEffect.h"
@@ skipping 1798 matching lines @@
     // todo: should handle these natively
     if (matrix || paint) {
         return false;
     }
 
     SkRect clipBounds;
     if (!mainCanvas->getClipBounds(&clipBounds)) {
         return true;
     }
 
-    SkTDArray<GrHoistedLayer> atlased, nonAtlased, recycled;
+    SkTDArray<GrHoistedLayer> atlasedNeedRendering, atlasedRecycled;
 
-    if (!GrLayerHoister::FindLayersToHoist(fContext, mainPicture, clipBounds, 
-                                           &atlased, &nonAtlased, &recycled)) {
-        return false;
-    }
+    GrLayerHoister::FindLayersToAtlas(fContext, mainPicture,
+                                      clipBounds,
+                                      &atlasedNeedRendering, &atlasedRecycled);
+
+    GrLayerHoister::DrawLayersToAtlas(fContext, atlasedNeedRendering);
+
+    SkTDArray<GrHoistedLayer> needRendering, recycled;
+
+    GrLayerHoister::FindLayersToHoist(fContext, mainPicture,
+                                      clipBounds,
+                                      &needRendering, &recycled);
+
+    GrLayerHoister::DrawLayers(fContext, needRendering);
 
     GrReplacements replacements;
 
-    GrLayerHoister::DrawLayers(fContext, atlased, nonAtlased, recycled, &replacements);
+    GrLayerHoister::ConvertLayersToReplacements(needRendering, &replacements);
+    GrLayerHoister::ConvertLayersToReplacements(recycled, &replacements);
 
     // Render the entire picture using new layers
     const SkMatrix initialMatrix = mainCanvas->getTotalMatrix();
 
     GrRecordReplaceDraw(mainPicture, mainCanvas, &replacements, initialMatrix, NULL);
 
-    GrLayerHoister::UnlockLayers(fContext, atlased, nonAtlased, recycled);
+    GrLayerHoister::UnlockLayers(fContext, needRendering);
+    GrLayerHoister::UnlockLayers(fContext, recycled);
+    GrLayerHoister::UnlockLayers(fContext, atlasedNeedRendering);
+    GrLayerHoister::UnlockLayers(fContext, atlasedRecycled);
 
     return true;
 }
 
 SkImageFilter::Cache* SkGpuDevice::getImageFilterCache() {
     // We always return a transient cache, so it is freed after each
     // filter traversal.
     return SkImageFilter::Cache::Create(kDefaultImageFilterCacheSize);
 }