diff options
| author | Cary Clark <cary@android.com> | 2010-06-25 11:27:47 -0400 |
|---|---|---|
| committer | Cary Clark <cary@android.com> | 2010-06-29 09:07:59 -0400 |
| commit | 9a211b99b45f5b1028389349eb946120e849b540 (patch) | |
| tree | 579bcf6babef89e5fcaaa4f7bc53150a7f37763e /WebCore/platform/graphics/android/ImageSourceAndroid.cpp | |
| parent | 5a22f5d5a894759137cbc73b987cc21fe3dbcb2e (diff) | |
| download | external_webkit-9a211b99b45f5b1028389349eb946120e849b540.zip external_webkit-9a211b99b45f5b1028389349eb946120e849b540.tar.gz external_webkit-9a211b99b45f5b1028389349eb946120e849b540.tar.bz2 | |
set maximum image size
Our use of web settings does not specify the maximum image size,
although we have some hard-coded values used when decoding the
image. For defective images, the hard-coded values are not enough,
since we may exceed memory in the decoder before the limit is
reached.
Pass along our limits to the decoder, and respect any limits
set by the caller.
companion change in frameworks/base
Change-Id: Icdfca87a44a3af8bcc1f0ed4792e04e060a67333
http://b/2689053
Diffstat (limited to 'WebCore/platform/graphics/android/ImageSourceAndroid.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index 200f52d..1212ff9 100644 --- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -95,7 +95,7 @@ SkPixelRef* SkCreateRLEPixelRef(const SkBitmap& src); Perhaps this value should be some fraction of the available RAM... */ -static size_t computeMaxBitmapSizeForCache() { +size_t computeMaxBitmapSizeForCache() { return MAX_SIZE_BEFORE_SUBSAMPLE; } |