Set Android/V8 memory limits from dalvik.vm.heapsize.

webkit/glue/webkit_glue.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 28 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #if defined(OS_WIN)
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
 #endif
 #include "v8/include/v8.h"
+#if defined(OS_ANDROID)
+#include "webkit/glue/dalvik_heap_size_android.h"
+#endif
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/user_agent.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebData;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebElement;
 using WebKit::WebFrame;
 using WebKit::WebGlyphCache;
 using WebKit::WebHistoryItem;
@@ skipping 15 matching lines @@
 //------------------------------------------------------------------------------
 // webkit_glue impl:
 
 namespace webkit_glue {
 
 // Global variable used by the plugin quirk "die after unload".
 bool g_forcefully_terminate_plugin_process = false;
 
 void SetJavaScriptFlags(const std::string& str) {
 #if WEBKIT_USING_V8
+#if defined(OS_ANDROID)
+  DalvikHeapSize* heap_size_singleton = DalvikHeapSize::GetInstance();
+  // Set V8 heap size to 3/4 of the device heap size.
+  int heap_size = std::max(32, heap_size_singleton->HeapSizeMB() / 4 * 3);

[jamesr, 2012/04/20 00:44:26]

you're clamping the heap size in dalvik_heap_size_android.cc, why are you doing
another round of clamping here?

[ulan, 2012/04/20 08:55:43]

This heap size is for setting V8 heap limit, which should be smaller than
renderer's heap size.

+  int code_size = heap_size / 4;
+  std::string heap_flags = base::StringPrintf(
+      "--max_old_gen_size=%d --max_executable_size=%d", heap_size, code_size);

[jamesr, 2012/04/20 00:44:26]

formatting a string flag is really hacky and very likely to break. please use
programmatic APIs to control the heap size and if they don't exist ask the V8
team to add them

[ulan, 2012/04/20 08:55:43]

Okay, removing this part from CL, will set this via API call during WebKit
initialization.

+  v8::V8::SetFlagsFromString(heap_flags.data(),
+                             static_cast<int>(heap_flags.size()));
+#endif
   v8::V8::SetFlagsFromString(str.data(), static_cast<int>(str.size()));
 #endif
 }
 
 void EnableWebCoreLogChannels(const std::string& channels) {
   if (channels.empty())
     return;
   StringTokenizer t(channels, ", ");
   while (t.GetNext()) {
     WebKit::enableLogChannel(t.token().c_str());
@@ skipping 398 matching lines @@
 std::string GetInspectorProtocolVersion() {
   return WebDevToolsAgent::inspectorProtocolVersion().utf8();
 }
 
 bool IsInspectorProtocolVersionSupported(const std::string& version) {
   return WebDevToolsAgent::supportsInspectorProtocolVersion(
       WebString::fromUTF8(version));
 }
 
 } // namespace webkit_glue