Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Unified Diff: src/core/SkResourceCache.cpp

Issue 617613003: Speculative revert to diagnose crash in chrome. Revert "Add SkCachedData and use it for SkMipMap" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkResourceCache.h ('k') | tests/CachedDataTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkResourceCache.cpp
diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index a673ec2d51aa4c39aa847c858f8d74fb63867e36..3098a9a2a13cf678f21cd2144d07e5575fe4483b 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();
« no previous file with comments | « src/core/SkResourceCache.h ('k') | tests/CachedDataTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698