Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1817)

Unified Diff: Source/platform/graphics/DeferredImageDecoder.cpp

Issue 266633010: Use skia discardable memory for decoded images on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/DeferredImageDecoder.cpp
diff --git a/Source/platform/graphics/DeferredImageDecoder.cpp b/Source/platform/graphics/DeferredImageDecoder.cpp
index abc9f8d929ae10bc1dfe637dd903060f0d4f809e..f01c84dc1df87d7f55c3e9047933cd4a7d0049dd 100644
--- a/Source/platform/graphics/DeferredImageDecoder.cpp
+++ b/Source/platform/graphics/DeferredImageDecoder.cpp
@@ -84,14 +84,11 @@ bool DeferredImageDecoder::isLazyDecoded(const SkBitmap& bitmap)
void DeferredImageDecoder::setEnabled(bool enabled)
{
s_enabled = enabled;
-#if !OS(ANDROID)
- // FIXME: This code is temporary to enable discardable memory for
- // non-Android platforms. In the future all platforms will be
- // the same and we can remove this code.
+ // FIXME: Remove all non-discardable memory related code now that this is
+ // used on all platforms.
s_skiaDiscardableMemoryEnabled = enabled;
if (enabled)
ImageDecodingStore::setImageCachingEnabled(false);
-#endif
}
bool DeferredImageDecoder::enabled()
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698