diff options
| author | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 12:48:20 +0000 |
|---|---|---|
| committer | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 12:48:20 +0000 |
| commit | b27cbe910a556d9b60976b7b804050646acadfbc (patch) | |
| tree | 2b27ee107a92327fb1b81d8449dbeaeba92342bb /content/renderer | |
| parent | 98de166d78a1f361d6466195f339f0dd13faf8e2 (diff) | |
| download | chromium_src-b27cbe910a556d9b60976b7b804050646acadfbc.zip chromium_src-b27cbe910a556d9b60976b7b804050646acadfbc.tar.gz chromium_src-b27cbe910a556d9b60976b7b804050646acadfbc.tar.bz2 | |
content: Enable SkScaledImageCache on Android.
This should be safe to use now that our ashmem implementation
of discardable memory handles high memory usage properly.
BUG=330041
TBR=jamesr
Review URL: https://codereview.chromium.org/261663004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 5380024..93b59c4 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -809,17 +809,10 @@ void RenderThreadImpl::EnsureWebKitInitialized() { webkit::SetSharedMemoryAllocationFunction(AllocateSharedMemoryFunction); - // Limit use of the scaled image cache to when deferred image decoding - // is enabled. - // TODO(reveman): Allow use of this cache on Android once - // SkDiscardablePixelRef is used for decoded images. crbug.com/330041 - bool use_skia_scaled_image_cache = false; -#if !defined(OS_ANDROID) - use_skia_scaled_image_cache = - command_line.HasSwitch(switches::kEnableDeferredImageDecoding) || - is_impl_side_painting_enabled_; -#endif - if (!use_skia_scaled_image_cache) + // Limit use of the scaled image cache to when deferred image decoding is + // enabled. + if (!command_line.HasSwitch(switches::kEnableDeferredImageDecoding) && + !is_impl_side_painting_enabled_) SkGraphics::SetImageCacheByteLimit(0u); } |