AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of Memory improvements to render_pdfs; better DM pool size defaults (https://codereview.chromium.org/433063002/)

Browse Source 
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
This commit is contained in:
halcanary 2014-08-01 11:54:48 -07:00 committed by Commit bot
parent a0cc8334da
commit f91b47ff9e
4 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gyp/common_conditions.gypi
View File

@ -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', {

5
gyp/tools.gyp
View File

@ -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',

9
src/lazy/SkDiscardableMemoryPool.h
View File

@ -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

5
tools/render_pdfs_main.cpp
View File

@ -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 @@ static bool render_pdf(const SkString& inputPath, const SkString& outputDir,
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());