Revert of Make GrScratchKey memory buffer correct size on copy

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 28 matching lines @@
 
     ResourceType resourceType() const { return fKey[kTypeAndSize_MetaDataIdx] & 0xffff; }
 
     uint32_t hash() const { return fKey[kHash_MetaDataIdx]; }
 
     size_t size() const { return SkToInt(fKey[kTypeAndSize_MetaDataIdx] >> 16); }
 
     const uint32_t* data() const { return &fKey[kMetaDataCnt]; }
 
     GrScratchKey& operator=(const GrScratchKey& that) {
-        size_t bytes = that.size();
-        fKey.reset(SkToInt(bytes / sizeof(uint32_t)));
-        memcpy(fKey.get(), that.fKey.get(), bytes);
+        size_t size = that.size();
+        fKey.reset(SkToInt(size));
+        memcpy(fKey.get(), that.fKey.get(), size);
         return *this;
     }
 
     bool operator==(const GrScratchKey& that) const {
         return 0 == memcmp(fKey.get(), that.fKey.get(), this->size());
     }
     bool operator!=(const GrScratchKey& that) const { return !(*this == that); }
 
     /** Used to initialize scratch key. */
     class Builder {
@@ skipping 88 matching lines @@
         memcpy(k + kCacheIDKeyOffset, key.fData8, sizeof(GrCacheID::Key));
         memcpy(k + kCacheIDDomainOffset, &domain, sizeof(GrCacheID::Domain));
         memcpy(k + kResourceFlagsOffset, &flags, sizeof(ResourceFlags));
         memset(k + kPadOffset, 0, kPadSize);
         fKey.setKeyData(keyData.fKey32);
     }
     GrBinHashKey<kKeySize> fKey;
 };
 
 #endif