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

This CL alters layer hoisting to defer creation of the free floating layers until they are actually needed (rather than creating _all_ the hoisted layers at the start).

It also fixes a pre vs. post Concat bug with how matrices were being accumulated.

BUG=skia:2315

Review URL: https://codereview.chromium.org/657383004

1 files changed, 6 insertions, 2 deletions

diff --git a/tests/GpuLayerCacheTest.cpp b/tests/GpuLayerCacheTest.cpp
index 62f6ec7a8c..0a8d0d2442 100644
--- a/tests/GpuLayerCacheTest.cpp
+++ b/tests/GpuLayerCacheTest.cpp
@@ -66,10 +66,14 @@ static void lock_layer(skiatest::Reporter* reporter,
     desc.fHeight = 512;
     desc.fConfig = kSkia8888_GrPixelConfig;
 
-    bool needsRerendering = cache->lock(layer, desc, false);
+    bool needsRerendering;
+    bool inAtlas = cache->tryToAtlas(layer, desc, &needsRerendering);
+    if (!inAtlas) {
+        cache->lock(layer, desc, &needsRerendering);
+    }
     REPORTER_ASSERT(reporter, needsRerendering);
 
-    needsRerendering = cache->lock(layer, desc, false);
+    cache->lock(layer, desc, &needsRerendering);
     REPORTER_ASSERT(reporter, !needsRerendering);
 
     REPORTER_ASSERT(reporter, layer->texture());