Zap the scratch key on non-RT textures when scratch textures are disabled.

Zap the scratch key on non-RT textures when scratch textures are disabled.

Committed: https://skia.googlesource.com/skia/+/db558dde227ee3c45fd654af6cd3071c1fa6aeb6

[bsalomon, 2015-01-23 20:56:39]

bsalomon@google.com changed reviewers:
+ robertphillips@google.com

[bsalomon, 2015-01-23 20:56:42]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2015-01-23 20:57:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/870103002/1

[commit-bot: I haz the power, 2015-01-23 20:57:47]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-01-24 02:57 UTC

[robertphillips, 2015-01-23 20:58:58]

lgtm

[commit-bot: I haz the power, 2015-01-23 21:01:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-01-23 21:01:37]

Try jobs failed on following builders:
  Build-Win-VS2013-x86-Debug-Trybot on client.skia.compile
(http://build.chromium.org/p/client.skia.compile/builders/Build-Win-VS2013-x86...)

[bsalomon, 2015-01-23 21:11:27]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2015-01-23 21:11:48]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/870103002/20001

[commit-bot: I haz the power, 2015-01-23 21:19:03]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/db558dde227ee3c45fd654af6cd3071c1fa6aeb6

[mtklein, 2015-01-26 14:13:20]

mtklein@google.com changed reviewers:
+ mtklein@google.com

[mtklein, 2015-01-26 14:13:21]

It looks a lot like this is causing the segfaults on the N5 and N10 debug
builds.  

I/DEBUG   (  180): backtrace:
I/DEBUG   (  180):     #00  pc 00272e82  /data/local/tmp/libskia_android.so
(SkChecksum::Compute(unsigned int const*, unsigned int)+93)
I/DEBUG   (  180):     #01  pc 00272ebf  /data/local/tmp/libskia_android.so
(SkChecksum::Compute(unsigned int const*, unsigned int)+154)
I/DEBUG   (  180): 
I/DEBUG   (  180): stack:
I/DEBUG   (  180):          bea6d9e0  bea6e380  [stack]
I/DEBUG   (  180):          bea6d9e4  b6ecdc0d  /system/lib/libc.so (free+12)
I/DEBUG   (  180):          bea6d9e8  02000005  
I/DEBUG   (  180):          bea6d9ec  001e8016  
I/DEBUG   (  180):          bea6d9f0  bea6d9f8  [stack]
I/DEBUG   (  180):          bea6d9f4  bea6d9f8  [stack]
I/DEBUG   (  180):          bea6d9f8  0000000c  
I/DEBUG   (  180):          bea6d9fc  bea6daec  [stack]
I/DEBUG   (  180):          bea6da00  bea6daf8  [stack]
I/DEBUG   (  180):          bea6da04  00000000  
I/DEBUG   (  180):          bea6da08  00000000  
I/DEBUG   (  180):          bea6da0c  bea6daec  [stack]
I/DEBUG   (  180):          bea6da10  00000000  
I/DEBUG   (  180):          bea6da14  e455dc80  
I/DEBUG   (  180):          bea6da18  bea6da20  [stack]
I/DEBUG   (  180):          bea6da1c  bea6da20  [stack]
I/DEBUG   (  180):     #00  bea6da20  fffffffc  
I/DEBUG   (  180):          ........  ........
I/DEBUG   (  180):     #01  bea6da20  fffffffc  
I/DEBUG   (  180):          bea6da24  b816b7f0  [heap]
I/DEBUG   (  180):          bea6da28  bea6da30  [stack]
I/DEBUG   (  180):          bea6da2c  0fffffff  
I/DEBUG   (  180):          bea6da30  00001e81  
I/DEBUG   (  180):          bea6da34  b818a004  
I/DEBUG   (  180):          bea6da38  ee40722a  
I/DEBUG   (  180):          bea6da3c  b816b7f0  [heap]
I/DEBUG   (  180):          bea6da40  bea6da48  [stack]
I/DEBUG   (  180):          bea6da44  b6c60117 
/data/local/tmp/libskia_android.so (GrResourceKeyHash(unsigned int const*,
unsigned int)+18)
I/DEBUG   (  180):          bea6da48  fffffffc  
I/DEBUG   (  180):          bea6da4c  b816b7f0  [heap]
I/DEBUG   (  180):          bea6da50  bea6da58  [stack]
I/DEBUG   (  180):          bea6da54  b6b79bff 
/data/local/tmp/libskia_android.so (GrResourceKey::validate() const+54)
I/DEBUG   (  180):          bea6da58  bea6da60  [stack]
I/DEBUG   (  180):          bea6da5c  b816b7e4  [heap]


http://build.chromium.org/p/client.skia.android/builders/Test-Android-Nexus5-...