aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2012-04-19 10:44:45 -0400
committerDerek Sollenberger <djsollen@google.com>2012-04-19 10:44:45 -0400
commitf98d96e192db421eed54103eedfcbb6600f73c08 (patch)
tree62b6cbcaa7aff6933ec366369d586eec0602c6bf
parent5cf20011a27fd13d9d08ae32b902471bb5fd0a65 (diff)
downloadexternal_skia-f98d96e192db421eed54103eedfcbb6600f73c08.zip
external_skia-f98d96e192db421eed54103eedfcbb6600f73c08.tar.gz
external_skia-f98d96e192db421eed54103eedfcbb6600f73c08.tar.bz2
Reset Skia to the default font cache size that we used in ICS.
bug: 6226962 Change-Id: I8d078faa836c1daa38810bc24aa24942cb70676f
-rw-r--r--include/core/SkUserConfig.h2
-rw-r--r--src/ports/SkFontHost_android.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/include/core/SkUserConfig.h b/include/core/SkUserConfig.h
index ef75114..91f8948 100644
--- a/include/core/SkUserConfig.h
+++ b/include/core/SkUserConfig.h
@@ -122,7 +122,7 @@
* To specify a different default font cache limit, define this. If this is
* undefined, skia will use a built-in value.
*/
-//#define SK_DEFAULT_FONT_CACHE_LIMIT (1024 * 1024)
+#define SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)
/* If defined, use CoreText instead of ATSUI on OS X.
*/
diff --git a/src/ports/SkFontHost_android.cpp b/src/ports/SkFontHost_android.cpp
index 20e334c..c836e2f 100644
--- a/src/ports/SkFontHost_android.cpp
+++ b/src/ports/SkFontHost_android.cpp
@@ -28,8 +28,6 @@
#include <stdio.h>
#include <string.h>
-#define FONT_CACHE_MEMORY_BUDGET (768 * 1024)
-
#ifndef SK_FONT_FILE_PREFIX
#define SK_FONT_FILE_PREFIX "/fonts/"
#endif