| Index: src/gpu/GrResourceCache.cpp
|
| diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
|
| index 4a0c9b2b369bbc12cb4254dedeaae16b929454d6..cb6bcf75fd7fa284276828679b24dc2df888e1c5 100644
|
| --- a/src/gpu/GrResourceCache.cpp
|
| +++ b/src/gpu/GrResourceCache.cpp
|
| @@ -42,7 +42,7 @@
|
| }
|
|
|
| uint32_t GrResourceKeyHash(const uint32_t* data, size_t size) {
|
| - return SkChecksum::Murmur3(data, size);
|
| + return SkChecksum::Compute(data, size);
|
| }
|
|
|
| //////////////////////////////////////////////////////////////////////////////
|
| @@ -564,7 +564,7 @@
|
| int currP = 0;
|
| int currNP = 0;
|
| while (currP < sortedPurgeableResources.count() &&
|
| - currNP < fNonpurgeableResources.count()) {
|
| + currNP < fNonpurgeableResources.count()) {
|
| uint32_t tsP = sortedPurgeableResources[currP]->cacheAccess().timestamp();
|
| uint32_t tsNP = fNonpurgeableResources[currNP]->cacheAccess().timestamp();
|
| SkASSERT(tsP != tsNP);
|
| @@ -596,10 +596,10 @@
|
|
|
| // count should be the next timestamp we return.
|
| SkASSERT(fTimestamp == SkToU32(count));
|
| -
|
| +
|
| // The historical timestamps of flushes are now invalid.
|
| this->resetFlushTimestamps();
|
| - }
|
| + }
|
| }
|
| return fTimestamp++;
|
| }
|
|
|