commit f91b47ff9ea6bd0246dc7c5a3f58d85860661ace
author halcanary <halcanary@google.com> Fri Aug 01 11:54:48 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Aug 01 11:54:48 2014 -0700
tree cdefd3d13793f8e6aaaa0af2b744e6bb2a8368db
parent a0cc8334dab67746c6a74807db92ce2607ed52ff

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

gyp/common_conditions.gypi

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 9884e1e..4fa1ba0 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -6,7 +6,6 @@
     'SK_SUPPORT_GPU=<(skia_gpu)',
     'SK_SUPPORT_OPENCL=<(skia_opencl)',
     'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
-    'SK_DEFAULT_RESOURCE_CACHE_MB_LIMIT=<(skia_resource_cache_mb_limit)',
   ],
   'conditions' : [
     ['skia_pic', {

gyp/tools.gyp

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 38996ad..e2e12bf 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -517,17 +517,12 @@
       'type': 'executable',
       'sources': [
         '../tools/render_pdfs_main.cpp',
-        '../tools/flags/SkCommandLineFlags.cpp',
-        '../tools/LazyDecodeBitmap.cpp',
         '../tools/PdfRenderer.cpp',
         '../tools/PdfRenderer.h',
       ],
       'include_dirs': [
-        '../src/core',
-        '../src/lazy',
         '../src/pipe/utils/',
         '../src/utils/',
-        '../tools/flags',
       ],
       'dependencies': [
         'pdf.gyp:pdf',

src/lazy/SkDiscardableMemoryPool.h

diff --git a/src/lazy/SkDiscardableMemoryPool.h b/src/lazy/SkDiscardableMemoryPool.h
index 57a14db..d141507 100644
--- a/src/lazy/SkDiscardableMemoryPool.h
+++ b/src/lazy/SkDiscardableMemoryPool.h
@@ -62,14 +62,7 @@
 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

tools/render_pdfs_main.cpp

diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp
index 5e87ec2..6e1d609 100644
--- a/tools/render_pdfs_main.cpp
+++ b/tools/render_pdfs_main.cpp
@@ -17,7 +17,6 @@
 #include "SkTArray.h"
 #include "PdfRenderer.h"
 #include "picture_utils.h"
-#include "LazyDecodeBitmap.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
@@ -159,9 +158,7 @@
         return false;
     }
 
-    SkAutoTUnref<SkPicture> picture(
-            SkPicture::CreateFromStream(
-                    &inputStream, &sk_tools::LazyDecodeBitmap));
+    SkAutoTUnref<SkPicture> picture(SkPicture::CreateFromStream(&inputStream));
 
     if (NULL == picture.get()) {
         SkDebugf("Could not read an SkPicture from %s\n", inputPath.c_str());