commit 90bac256d9f48d4ee52d0e08bf0e5cad57b3c51c
author Russell Brenner <russellbrenner@google.com> Thu Nov 18 13:33:46 2010 -0800
committer Russell Brenner <russellbrenner@google.com> Fri Nov 19 09:50:30 2010 -0800
tree 34cbd1563f2fe283e628dba6a333b1b13f68892a
parent 3e5fa29ddb82551500b118e9bf37af3966277b70

Update V8 to r5804 as required by WebKit r72274

Change-Id: I287670630b22383dbce46e4a6fad4ec9eb37d8b8

src/spaces.h

diff --git a/src/spaces.h b/src/spaces.h
index 3ed2fe8..0c10d2c 100644
--- a/src/spaces.h
+++ b/src/spaces.h
@@ -491,8 +491,8 @@
 class MemoryAllocator : public AllStatic {
  public:
   // Initializes its internal bookkeeping structures.
-  // Max capacity of the total space.
-  static bool Setup(intptr_t max_capacity);
+  // Max capacity of the total space and executable memory limit.
+  static bool Setup(intptr_t max_capacity, intptr_t capacity_executable);
 
   // Deletes valid chunks.
   static void TearDown();
@@ -590,6 +590,12 @@
   // Returns allocated spaces in bytes.
   static intptr_t Size() { return size_; }
 
+  // Returns the maximum available executable bytes of heaps.
+  static int AvailableExecutable() {
+    if (capacity_executable_ < size_executable_) return 0;
+    return capacity_executable_ - size_executable_;
+  }
+
   // Returns allocated executable spaces in bytes.
   static intptr_t SizeExecutable() { return size_executable_; }
 
@@ -653,6 +659,8 @@
  private:
   // Maximum space size in bytes.
   static intptr_t capacity_;
+  // Maximum subset of capacity_ that can be executable
+  static intptr_t capacity_executable_;
 
   // Allocated space size in bytes.
   static intptr_t size_;