aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/lazy
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2014-08-01 11:54:48 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-08-01 11:54:48 -0700
commitf91b47ff9ea6bd0246dc7c5a3f58d85860661ace (patch)
treecdefd3d13793f8e6aaaa0af2b744e6bb2a8368db /src/lazy
parenta0cc8334dab67746c6a74807db92ce2607ed52ff (diff)
Revert of Memory improvements to render_pdfs; better DM pool size defaults (https://codereview.chromium.org/433063002/)
Reason for revert: breaking android tests Original issue's description: > Memory improvements to render_pdfs; better DM pool size defaults > > Make SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE equal to > skia_resource_cache_mb_limit, if that value is >0 (true for some > low-memory Android devices). > > render_pdfs test program uses lazy decoding (and the discardable > memory pool). > > BUG=skia:2743 > > Committed: https://skia.googlesource.com/skia/+/66058b614d9c8cb63c24b1c779dd1a9a80752217 R=djsollen@google.com, mtklein@google.com TBR=djsollen@google.com, mtklein@google.com NOTREECHECKS=true NOTRY=true BUG=skia:2743 Author: halcanary@google.com Review URL: https://codereview.chromium.org/418173012
Diffstat (limited to 'src/lazy')
-rw-r--r--src/lazy/SkDiscardableMemoryPool.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lazy/SkDiscardableMemoryPool.h b/src/lazy/SkDiscardableMemoryPool.h
index 57a14db0dd..d141507004 100644
--- a/src/lazy/SkDiscardableMemoryPool.h
+++ b/src/lazy/SkDiscardableMemoryPool.h
@@ -62,14 +62,7 @@ public:
SkDiscardableMemoryPool* SkGetGlobalDiscardableMemoryPool();
#if !defined(SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE)
- #if defined(SK_DEFAULT_RESOURCE_CACHE_MB_LIMIT) && \
- SK_DEFAULT_RESOURCE_CACHE_MB_LIMIT > 0
- #define SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE \
- (SK_DEFAULT_RESOURCE_CACHE_MB_LIMIT * 1024 * 1024)
- #else
- #define SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE \
- (128 * 1024 * 1024)
- #endif
+#define SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (128 * 1024 * 1024)
#endif
#endif // SkDiscardableMemoryPool_DEFINED