Index: src/codec/SkJpegDecoderMgr.cpp |
diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp |
index c1f044c64f98001d261779b959d715e04420fdae..93ad1fd56b727a12bb038e1141eae0ae17ca5a03 100644 |
--- a/src/codec/SkJpegDecoderMgr.cpp |
+++ b/src/codec/SkJpegDecoderMgr.cpp |
@@ -32,15 +32,8 @@ static void output_message(j_common_ptr info) { |
*/ |
static void overwrite_mem_buffer_size(jpeg_decompress_struct* dinfo) { |
#ifdef SK_BUILD_FOR_ANDROID |
- |
-// Use 30 MB for devices with a large amount of system memory and 5MB otherwise |
-// TODO: (msarett) This matches SkImageDecoder. Why were these values chosen? |
-#ifdef ANDROID_LARGE_MEMORY_DEVICE |
+ // We can use a large chunk of memory on all currently supported Android devices |
dinfo->mem->max_memory_to_use = 30 * 1024 * 1024; |
scroggo
2015/04/27 20:05:58
Why do we use this value? I think I saw in your no
scroggo
2015/04/27 20:24:31
I think I've answered my own question: at least wh
|
-#else |
- dinfo->mem->max_memory_to_use = 5 * 1024 * 1024; |
-#endif |
- |
#endif // SK_BUILD_FOR_ANDROID |
} |