aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkResourceCache.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2014-10-03 13:23:30 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-03 13:23:31 -0700
commit37c5a815d8ea33247968212ef4cc83394ceee1bc (patch)
tree549847a55767b6deea8428b66068e82b43af13c0 /src/core/SkResourceCache.cpp
parent9e96aa07dbf1210fd35ae8e0c54d4d9822544e89 (diff)
Speculative revert to diagnose crash in chrome. Revert "Add SkCachedData and use it for SkMipMap"
Diffstat (limited to 'src/core/SkResourceCache.cpp')
-rw-r--r--src/core/SkResourceCache.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index a673ec2d51..3098a9a2a1 100644
--- a/src/core/SkResourceCache.cpp
+++ b/src/core/SkResourceCache.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "SkCachedData.h"
#include "SkChecksum.h"
#include "SkResourceCache.h"
#include "SkMipMap.h"
@@ -264,15 +263,6 @@ size_t SkResourceCache::setTotalByteLimit(size_t newLimit) {
return prevLimit;
}
-SkCachedData* SkResourceCache::newCachedData(size_t bytes) {
- if (fDiscardableFactory) {
- SkDiscardableMemory* dm = fDiscardableFactory(bytes);
- return dm ? SkNEW_ARGS(SkCachedData, (bytes, dm)) : NULL;
- } else {
- return SkNEW_ARGS(SkCachedData, (sk_malloc_throw(bytes), bytes));
- }
-}
-
///////////////////////////////////////////////////////////////////////////////
void SkResourceCache::detach(Rec* rec) {
@@ -452,11 +442,6 @@ SkBitmap::Allocator* SkResourceCache::GetAllocator() {
return get_cache()->allocator();
}
-SkCachedData* SkResourceCache::NewCachedData(size_t bytes) {
- SkAutoMutexAcquire am(gMutex);
- return get_cache()->newCachedData(bytes);
-}
-
void SkResourceCache::Dump() {
SkAutoMutexAcquire am(gMutex);
get_cache()->dump();