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

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

Issue 274563005: Revert 173540 "Use skia discardable memory for decoded images on..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 7 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: trunk/Source/platform/graphics/DeferredImageDecoder.cpp
===================================================================
--- trunk/Source/platform/graphics/DeferredImageDecoder.cpp (revision 173568)
+++ trunk/Source/platform/graphics/DeferredImageDecoder.cpp (working copy)
@@ -84,11 +84,14 @@
void DeferredImageDecoder::setEnabled(bool enabled)
{
s_enabled = enabled;
- // FIXME: Remove all non-discardable memory related code now that this is
- // used on all platforms.
+#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.
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