bump up our image cache etc. when we're on larger devices (e.g. have VFP)

fixes http://b/issue?id=2236822

2 files changed, 8 insertions, 7 deletions

diff --git a/Android.mk b/Android.mk
index 0d8d847..6aae0b7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -224,6 +224,12 @@ LOCAL_CFLAGS += -Darm
 LOCAL_CFLAGS += -Wno-psabi
 endif
 
+# need a flag to tell the C side when we're on devices with large memory
+# budgets (i.e. larger than the low-end devices that initially shipped)
+ifeq ($(ARCH_ARM_HAVE_VFP),true)
+LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
+endif
+
 ifeq ($(ENABLE_SVG),true)
 LOCAL_CFLAGS += -DENABLE_SVG=1
 endif
diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
index c486a6a..b86763a 100644
--- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
@@ -37,12 +37,6 @@
 #include "SkStream.h"
 #include "SkTemplates.h"
 
-// need a flag to tell us when we're on a large-ram device (e.g. >= 256M)
-// for now just use this hack
-#if 1
-    #define ON_LARGE_RAM_DEVICE
-#endif
-
 #ifdef ANDROID_ANIMATED_GIF
     #include "EmojiFont.h"
     #include "GIFImageDecoder.h"
@@ -58,7 +52,8 @@ SkPixelRef* SkCreateRLEPixelRef(const SkBitmap& src);
 //#define TRACE_RLE_BITMAPS
 
 
-#ifdef ON_LARGE_RAM_DEVICE
+// flag to tell us when we're on a large-ram device (e.g. >= 256M)
+#ifdef ANDROID_LARGE_MEMORY_DEVICE
     // don't use RLE for images smaller than this, since they incur a drawing cost
     // (and don't work as patterns yet) we only want to use RLE when we must
     #define MIN_RLE_ALLOC_SIZE          (8*1024*1024)