Fuse GrReplacements and GrLayerCache

src/core/SkLayerInfo.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 SkLayerInfo_DEFINED
 #define SkLayerInfo_DEFINED
 
@@ skipping 35 matching lines @@
         // The index of the matching restore in the picture.
         size_t  fRestoreOpID;
         // True if this saveLayer has at least one other saveLayer nested within it.
         // False otherwise.
         bool    fHasNestedLayers;
         // True if this saveLayer is nested within another. False otherwise.
         bool    fIsNested;
         // The variable length key for this saveLayer block. It stores the
         // thread of drawPicture and saveLayer operation indices that lead to this
         // saveLayer (including its own op index). The BlockInfo owns this memory.
-        int*    fKey;
+        unsigned* fKey;
         int     fKeySize;  // # of ints
     };
 
     SkLayerInfo(Key key) : INHERITED(key) { }
 
     BlockInfo& addBlock() { return fBlocks.push_back(); }
 
     int numBlocks() const { return fBlocks.count(); }
 
     const BlockInfo& block(int index) const {
         SkASSERT(index < fBlocks.count());
 
         return fBlocks[index];
     }
 
     // We may, in the future, need to pass in the GPUDevice in order to
     // incorporate the clip and matrix state into the key
     static SkPicture::AccelData::Key ComputeKey();
 
 private:
     SkTArray<BlockInfo, true> fBlocks;
 
     typedef SkPicture::AccelData INHERITED;
 };
 
 #endif // SkLayerInfo_DEFINED