commit 37f9a2694c15f08e361ebda74fe9f0fffbf452aa
author bsalomon <bsalomon@google.com> Mon Feb 02 13:00:10 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 02 13:00:10 2015 -0800
tree 2bbbb36f91b31cc203fa375939ab2d4a4a5117f0
parent 52edc4d05380c88de5b334479ad8e537ef2b4925

Move npot resizing out of GrContext and simplify GrContext texture functions.

Committed: https://skia.googlesource.com/skia/+/8a8100349105c8c6de39fcb34e47679da7a67f54

Committed: https://skia.googlesource.com/skia/+/6c96672491b04cb782bce8fee778124df66524a0

Review URL: https://codereview.chromium.org/882223003

include/gpu/GrResourceKey.h

diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h
index 4c76b68..e09a2c7 100644
--- a/include/gpu/GrResourceKey.h
+++ b/include/gpu/GrResourceKey.h
@@ -220,6 +220,7 @@
         Builder(GrContentKey* key, const GrContentKey& innerKey, Domain domain,
                 int extraData32Cnt)
             : INHERITED::Builder(key, domain, Data32CntForInnerKey(innerKey) + extraData32Cnt) {
+            SkASSERT(&innerKey != key);
             // add the inner key to the end of the key so that op[] can be indexed normally.
             uint32_t* innerKeyData = &this->operator[](extraData32Cnt);
             const uint32_t* srcData = innerKey.data();