Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what…

include/gpu/GrResourceKey.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 GrResourceKey_DEFINED
 #define GrResourceKey_DEFINED
@@ skipping 120 matching lines @@
 
     void validate() const {
         SkASSERT(fKey[kHash_MetaDataIdx] ==
                  GrResourceKeyHash(&fKey[kHash_MetaDataIdx] + 1,
                                    this->internalSize() - sizeof(uint32_t)));
         SkASSERT(SkIsAlign4(this->internalSize()));
     }
 
     friend class TestResource; // For unit test to access kMetaDataCnt.
 
-    // bmp textures require 4 uint32_t values.
-    SkAutoSTMalloc<kMetaDataCnt + 4, uint32_t> fKey;
+    // bmp textures require 5 uint32_t values.
+    SkAutoSTMalloc<kMetaDataCnt + 5, uint32_t> fKey;
 };
 
 /**
  * A key used for scratch resources. There are three important rules about scratch keys:
  *        * Multiple resources can share the same scratch key. Therefore resources assigned the same
  *          scratch key should be interchangeable with respect to the code that uses them.
  *        * A resource can have at most one scratch key and it is set at resource creation by the
  *          resource itself.
  *        * When a scratch resource is ref'ed it will not be returned from the
  *          cache for a subsequent cache request until all refs are released. This facilitates using
@@ skipping 159 matching lines @@
         fKey = that.fKey;
         return *this;
     }
 
     const GrUniqueKey& key() const { return fKey; }
 
 private:
     GrUniqueKey fKey;
 };
 #endif