| Index: src/gpu/GrResourceCache.cpp
|
| diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
|
| index 71e40f1a5364fff5f31919231d527de982f1bb07..62360ed5358fb21f7e8c547310e314af05f749d2 100644
|
| --- a/src/gpu/GrResourceCache.cpp
|
| +++ b/src/gpu/GrResourceCache.cpp
|
| @@ -11,9 +11,9 @@
|
| #include "GrCaps.h"
|
| #include "GrGpuResourceCacheAccess.h"
|
| #include "GrTracing.h"
|
| -#include "SkChecksum.h"
|
| #include "SkGr.h"
|
| #include "SkMessageBus.h"
|
| +#include "SkOpts.h"
|
| #include "SkTSort.h"
|
|
|
| DECLARE_SKMESSAGEBUS_MESSAGE(GrUniqueKeyInvalidatedMessage);
|
| @@ -43,7 +43,7 @@ GrUniqueKey::Domain GrUniqueKey::GenerateDomain() {
|
| }
|
|
|
| uint32_t GrResourceKeyHash(const uint32_t* data, size_t size) {
|
| - return SkChecksum::Murmur3(data, size);
|
| + return SkOpts::hash(data, size);
|
| }
|
|
|
| //////////////////////////////////////////////////////////////////////////////
|
| @@ -687,7 +687,7 @@ void GrResourceCache::validate() const {
|
| SkASSERT(SkBudgeted::kNo == resource->resourcePriv().isBudgeted() ||
|
| uniqueKey.isValid());
|
| if (!uniqueKey.isValid()) {
|
| - ++fCouldBeScratch;
|
| + ++fCouldBeScratch;
|
| SkASSERT(fScratchMap->countForKey(scratchKey));
|
| }
|
| SkASSERT(!resource->resourcePriv().refsWrappedObjects());
|
|
|