diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/content/renderer/renderer_main.cc | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/content/renderer/renderer_main.cc')
| -rw-r--r-- | chromium/content/renderer/renderer_main.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chromium/content/renderer/renderer_main.cc b/chromium/content/renderer/renderer_main.cc index 0a8b0d84bfc..2d298a60b98 100644 --- a/chromium/content/renderer/renderer_main.cc +++ b/chromium/content/renderer/renderer_main.cc @@ -34,6 +34,11 @@ #include "webkit/child/webkit_child_helpers.h" #include "webkit/glue/webkit_glue.h" +#if defined(OS_ANDROID) +#include "base/android/sys_utils.h" +#include "third_party/skia/include/core/SkGraphics.h" +#endif // OS_ANDROID + #if defined(OS_MACOSX) #include <Carbon/Carbon.h> #include <signal.h> @@ -133,6 +138,13 @@ int RendererMain(const MainFunctionParams& parameters) { } #endif +#if defined(OS_ANDROID) + const int kMB = 1024 * 1024; + size_t font_cache_limit = + base::android::SysUtils::IsLowEndDevice() ? kMB : 8 * kMB; + SkGraphics::SetFontCacheLimit(font_cache_limit); +#endif + // This function allows pausing execution using the --renderer-startup-dialog // flag allowing us to attach a debugger. // Do not move this function down since that would mean we can't easily debug @@ -181,8 +193,6 @@ int RendererMain(const MainFunctionParams& parameters) { base::FieldTrialList field_trial_list(NULL); // Ensure any field trials in browser are reflected into renderer. if (parsed_command_line.HasSwitch(switches::kForceFieldTrials)) { - std::string persistent = parsed_command_line.GetSwitchValueASCII( - switches::kForceFieldTrials); // Field trials are created in an "activated" state to ensure they get // reported in crash reports. bool result = base::FieldTrialList::CreateTrialsFromString( |