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 --- tools/render_pdfs_main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tools/render_pdfs_main.cpp') diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp index 5e87ec2e46..6e1d609cde 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 @@ static bool render_pdf(const SkString& inputPath, const SkString& outputDir, return false; } - SkAutoTUnref picture( - SkPicture::CreateFromStream( - &inputStream, &sk_tools::LazyDecodeBitmap)); + SkAutoTUnref picture(SkPicture::CreateFromStream(&inputStream)); if (NULL == picture.get()) { SkDebugf("Could not read an SkPicture from %s\n", inputPath.c_str()); -- cgit v1.2.3