From f91b47ff9ea6bd0246dc7c5a3f58d85860661ace Mon Sep 17 00:00:00 2001 From: halcanary Date: Fri, 1 Aug 2014 11:54:48 -0700 Subject: 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 --- src/lazy/SkDiscardableMemoryPool.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/lazy') 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 -- cgit v1.2.3