Move offset and CTM from LayerCache Key to per-hoisted-layer info

src/gpu/GrLayerHoister.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrLayerHoister_DEFINED
 #define GrLayerHoister_DEFINED
 
 #include "SkPicture.h"
 #include "SkTDArray.h"
 
 class GrAccelData;
 struct GrCachedLayer;
 class GrReplacements;
 struct SkRect;
 
 // This class collects the layer hoisting functionality in one place.
 // For each picture rendering:
 //  FindLayersToHoist should be called once to collect the required layers
 //  DrawLayers should be called once to render them
 //  UnlockLayers should be called once to allow the texture resources to be recycled
 class GrLayerHoister {
 public:
     struct HoistedLayer {
         const SkPicture* fPicture;
         GrCachedLayer*   fLayer;
+        SkIPoint         fOffset;
+        SkMatrix         fCTM;
     };
 
     /** Find the layers in 'topLevelPicture' that need hoisting. Note that the discovered
         layers can be inside nested sub-pictures.
         @param topLevelPicture The top-level picture that is about to be rendered
         @param query       The rectangle that is about to be drawn.
         @param atlased     Out parameter storing the layers that should be hoisted to the atlas
         @param nonAtlased  Out parameter storing the layers that should be hoisted stand alone
         @param layerCache The source of new layers
         Return true if any layers are suitable for hoisting; false otherwise
@@ skipping 17 matching lines @@
         @param layerCache holder of the locked layers
         @param atlased    Unneeded layers in the atlas
         @param nonAtlased Unneeded layers in their own textures
     */
     static void UnlockLayers(GrLayerCache* layerCache,
                              const SkTDArray<HoistedLayer>& atlased,
                              const SkTDArray<HoistedLayer>& nonAtlased);
 };
 
 #endif