Use variable length key (rather than accumulated matrix) as save layer hoisting key

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 1814 matching lines @@
     GrLayerHoister::FindLayersToHoist(fContext, mainPicture,
                                       initialMatrix,
                                       clipBounds,
                                       &needRendering, &recycled,
                                       fRenderTarget->numSamples());
 
     GrLayerHoister::DrawLayers(fContext, needRendering);
 
     GrReplacements replacements;
 
-    GrLayerHoister::ConvertLayersToReplacements(needRendering, &replacements);
-    GrLayerHoister::ConvertLayersToReplacements(recycled, &replacements);
+    GrLayerHoister::ConvertLayersToReplacements(mainPicture, needRendering, &replacements);
+    GrLayerHoister::ConvertLayersToReplacements(mainPicture, recycled, &replacements);
 
     // Render the entire picture using new layers
     GrRecordReplaceDraw(mainPicture, mainCanvas, &replacements, initialMatrix, NULL);
 
     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);
 }
 
 #endif