[chromium] Don't use increased FontCache size on Android

https://bugs.webkit.org/show_bug.cgi?id=78656

Reviewed by Adam Barth.

The chromium port uses a larger font cache size because it increases
performance on the intl1 and intl2 page cyclers. However, on Android
devices where resources are more constrained, it isn't desireable to
allow the FontCache to grow so big.

No new tests because no testable difference in functionality.

* platform/graphics/FontCache.cpp:
(WebCore):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107794 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b439616..f95dabd 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2012-02-15  Tony Gentilcore  <tonyg@chromium.org>
+
+        [chromium] Don't use increased FontCache size on Android
+        https://bugs.webkit.org/show_bug.cgi?id=78656
+
+        Reviewed by Adam Barth.
+
+        The chromium port uses a larger font cache size because it increases
+        performance on the intl1 and intl2 page cyclers. However, on Android
+        devices where resources are more constrained, it isn't desireable to
+        allow the FontCache to grow so big.
+
+        No new tests because no testable difference in functionality.
+
+        * platform/graphics/FontCache.cpp:
+        (WebCore):
+
 2012-02-15  Roland Steiner  <rolandsteiner@chromium.org>
 
         <style scoped>: Allow <style scoped> as a direct child of a ShadowRoot

diff --git a/Source/WebCore/platform/graphics/FontCache.cpp b/Source/WebCore/platform/graphics/FontCache.cpp
index 870c649..47f251c 100644 (file)
--- a/Source/WebCore/platform/graphics/FontCache.cpp
+++ b/Source/WebCore/platform/graphics/FontCache.cpp
@@ -252,7 +252,7 @@ typedef HashMap<FontPlatformData, pair<SimpleFontData*, unsigned>, FontDataCache
 
 static FontDataCache* gFontDataCache = 0;
 
-#if PLATFORM(CHROMIUM)
+#if PLATFORM(CHROMIUM) && !OS(ANDROID)
 const int cMaxInactiveFontData = 250;
 const int cTargetInactiveFontData = 200;
 #else