diff options
| author | Cary Clark <cary@android.com> | 2010-03-30 10:25:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-30 10:25:50 -0700 |
| commit | 300f320e0d134e6ed00bef6e63278a825381345b (patch) | |
| tree | 9e30352245cd6625232cae2d72c430c0785556a4 /WebCore/platform | |
| parent | 15a662df5e0c0c067fd6de1feeddb5fd04f283df (diff) | |
| parent | b8cdf48e1603682b3458fa2aa245884f36c43882 (diff) | |
| download | external_webkit-300f320e0d134e6ed00bef6e63278a825381345b.zip external_webkit-300f320e0d134e6ed00bef6e63278a825381345b.tar.gz external_webkit-300f320e0d134e6ed00bef6e63278a825381345b.tar.bz2 | |
Merge "enable gifs for large memory devices" into froyo
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index fa1794c..06455d2 100644 --- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -215,8 +215,12 @@ void ImageSource::setURL(const String& url) // we only animate small GIFs for now, to save memory // also, we only support this in Japan, hence the Emoji check static bool should_use_animated_gif(int width, int height) { +#ifdef ANDROID_LARGE_MEMORY_DEVICE + return true; +#else return EmojiFont::IsAvailable() && width <= 32 && height <= 32; +#endif } #endif |