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 13 matching lines @@
 static const char kFileTestPrefix[] = "(file test):";
 
 //------------------------------------------------------------------------------
 // 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) {

[tonyg, 2012/04/19 16:04:30]

This method's contract seems to be to set the flags in str. In fact,
render_process_impl.cc may call it multiple times, so it seems silly to re-set
the same flags for android inside this method each time.

Can you instead add the heap size related flags in render_process_impl.cc
instead of here? Or if it is important to update the test callsites, maybe there
is some other way?

[ulan, 2012/04/19 17:46:24]

I am not sure about moving dependency on DalvikHeapSize to content/renderer (see
also reply to Erik's comment below). 

James, what do you think?

 #if WEBKIT_USING_V8
+#if defined(OS_ANDROID)
+  DalvikHeapSize* heap_size_singleton = DalvikHeapSize::GetInstance();
+  // Set V8 heap size to 6/8 of the device heap size.

[Erik Corry, 2012/04/19 16:52:56]

Why not 3/4?

[ulan, 2012/04/19 17:46:24]

Done.

+  int heap_size = std::max(32, heap_size_singleton->HeapSizeMB() / 8 * 6);
+  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);

[Erik Corry, 2012/04/19 16:52:56]

I think it would be cleaner to use SetResourceConstraints from the API instead
of SetFlagsFromString.

[ulan, 2012/04/19 17:46:24]

Proper place to call SetResourceConstraints seems to be WebKit
(https://codesearch.corp.google.com/#chrome/src/third_party/WebKit/Source/WebC...
).

To do that we would need to export DalvikHeapSize properly. So we would need to
abstract it for all platforms and then put it into PlatformSupport. This would
take some time to land.

I would prefer to land a quick fix first and then follow up with another CL.

+  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