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

webkit/glue/dalvik_heap_size_android.cc

Index: webkit/glue/dalvik_heap_size_android.cc
diff --git a/webkit/glue/dalvik_heap_size_android.cc b/webkit/glue/dalvik_heap_size_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..78c79152ef3d9a849f0da7b8a8a4fae115ea8cdb
--- /dev/null
+++ b/webkit/glue/dalvik_heap_size_android.cc
@@ -0,0 +1,40 @@
+// 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/dalvik_heap_size_android.h"
+
+#include "base/memory/singleton.h"
+
+namespace webkit_glue {
+
+DalvikHeapSize* DalvikHeapSize::GetInstance() {
+  return Singleton<DalvikHeapSize>::get();
+}
+

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

Just one blank line between methods.

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

Done.

+
+DalvikHeapSize::DalvikHeapSize() : heap_size_mb_(0) {
+  char heap_size_str[PROP_VALUE_MAX];
+  __system_property_get("dalvik.vm.heapsize", heap_size_str);
+  heap_size_mb_ = ParseHeapSize(std::string(heap_size_str));
+}
+
+
+DalvikHeapSize::~DalvikHeapSize() {}
+
+
+int DalvikHeapSize::HeapSizeMB() { return heap_size_mb_; }
+
+
+int DalvikHeapSize::ParseHeapSize(const std::string& str) {
+  CHECK_GT(str.size(), 0u);
+  DCHECK_EQ('m', str[str.size() - 1]);
+  int result = 0;
+  base::StringToInt(str.substr(0, str.size() - 1), &result);
+  DCHECK_GT(result, 0);
+  // dalvik.vm.heapsize property is writable by user,
+  // truncate it to reasonable value to avoid overflows later.
+  return std::min(std::max(32, result), 1024);
+}
+
+} // webkit_glue namespace