Ensure that GrCacheID::Key instances are fully initialized.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7036046
git-svn-id: http://skia.googlecode.com/svn/trunk@6971 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrStencilBuffer.cpp b/src/gpu/GrStencilBuffer.cpp
index 623861d..865961a 100644
--- a/src/gpu/GrStencilBuffer.cpp
+++ b/src/gpu/GrStencilBuffer.cpp
@@ -29,6 +29,7 @@
keyData[0] = width;
keyData[1] = height;
keyData[2] = sampleCnt;
+ memset(keyData + 3, 0, sizeof(key) - 3 * sizeof(uint32_t));
GR_STATIC_ASSERT(sizeof(key) >= 3 * sizeof(uint32_t));
cacheID->reset(gStencilBufferDomain, key);
}
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 695b1df..fac18e9 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -69,6 +69,8 @@
memcpy(key.fData8 + 4, &width, 2);
memcpy(key.fData8 + 6, &height, 2);
memcpy(key.fData8 + 8, &offset, sizeof(size_t));
+ static const size_t kKeyDataSize = 8 + sizeof(size_t);
+ memset(key.fData8 + kKeyDataSize, 0, sizeof(key) - kKeyDataSize);
GR_STATIC_ASSERT(sizeof(key) >= 8 + sizeof(size_t));
static const GrCacheID::Domain gBitmapTextureDomain = GrCacheID::GenerateDomain();
id->reset(gBitmapTextureDomain, key);