Reviewers: Benedikt Meurer,

Message:
Benedikt, please take a look.

Description:
Remove deprecated v8::SetResourceConstraints without Isolate parameter

LOG=Y

Please review this at https://codereview.chromium.org/62193003/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+7, -19 lines):
  M include/v8.h
  M src/api.cc
  M test/cctest/test-api.cc
  M test/cctest/test-strings.cc


Index: include/v8.h
diff --git a/include/v8.h b/include/v8.h
index f0b627e7b79c16c05f5c64beedb572587889291e..ef6d8fa1d9307d7aacd556a12771c11b6246ca55 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -3831,11 +3831,6 @@ class V8_EXPORT ResourceConstraints {
 };


-V8_DEPRECATED(
-    "Use SetResourceConstraints(isolate, constraints) instead",
- bool V8_EXPORT SetResourceConstraints(ResourceConstraints* constraints));
-
-
 /**
  * Sets the given ResourceConstraints on the given Isolate.
  */
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index 736f0b00d7ac833ca3409ebd703a90f8ef49a5bc..8af9a9b6665a9f7890ea7f5f4e7d875929e14115 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -602,13 +602,6 @@ void ResourceConstraints::ConfigureDefaults(uint64_t physical_memory) {
 }


-bool SetResourceConstraints(ResourceConstraints* constraints) {
-  i::Isolate* isolate = EnterIsolateIfNeeded();
-  return SetResourceConstraints(reinterpret_cast<Isolate*>(isolate),
-                                constraints);
-}
-
-
 bool SetResourceConstraints(Isolate* v8_isolate,
                             ResourceConstraints* constraints) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index 6a75cd72dbf890ddbefc7e8ae9a460a74e7b6f8c..5b40b7e4c5ce159b827ada968178d796ce906317 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -4263,7 +4263,7 @@ TEST(OutOfMemory) {
   v8::ResourceConstraints constraints;
   constraints.set_max_young_space_size(256 * K);
   constraints.set_max_old_space_size(5 * K * K);
-  v8::SetResourceConstraints(&constraints);
+  v8::SetResourceConstraints(CcTest::isolate(), &constraints);

   // Execute a script that causes out of memory.
   LocalContext context;
@@ -4304,7 +4304,7 @@ TEST(OutOfMemoryNested) {
   v8::ResourceConstraints constraints;
   constraints.set_max_young_space_size(256 * K);
   constraints.set_max_old_space_size(5 * K * K);
-  v8::SetResourceConstraints(&constraints);
+  v8::SetResourceConstraints(CcTest::isolate(), &constraints);

   v8::HandleScope scope(CcTest::isolate());
   Local<ObjectTemplate> templ = ObjectTemplate::New();
@@ -4333,7 +4333,7 @@ TEST(HugeConsStringOutOfMemory) {
   v8::ResourceConstraints constraints;
   constraints.set_max_young_space_size(256 * K);
   constraints.set_max_old_space_size(4 * K * K);
-  v8::SetResourceConstraints(&constraints);
+  v8::SetResourceConstraints(CcTest::isolate(), &constraints);

   // Execute a script that causes out of memory.
   v8::V8::IgnoreOutOfMemoryException();
@@ -17172,7 +17172,7 @@ TEST(SetResourceConstraints) {
   // Set stack limit.
   v8::ResourceConstraints constraints;
   constraints.set_stack_limit(set_limit);
-  CHECK(v8::SetResourceConstraints(&constraints));
+  CHECK(v8::SetResourceConstraints(CcTest::isolate(), &constraints));

   // Execute a script.
   LocalContext env;
@@ -17196,7 +17196,7 @@ TEST(SetResourceConstraintsInThread) {
     // Set stack limit.
     v8::ResourceConstraints constraints;
     constraints.set_stack_limit(set_limit);
-    CHECK(v8::SetResourceConstraints(&constraints));
+    CHECK(v8::SetResourceConstraints(CcTest::isolate(), &constraints));

     // Execute a script.
     v8::HandleScope scope(CcTest::isolate());
@@ -18646,7 +18646,7 @@ class InitDefaultIsolateThread : public v8::internal::Thread {
       v8::ResourceConstraints constraints;
       constraints.set_max_young_space_size(256 * K);
       constraints.set_max_old_space_size(4 * K * K);
-      v8::SetResourceConstraints(&constraints);
+      v8::SetResourceConstraints(CcTest::isolate(), &constraints);
       break;
     }

Index: test/cctest/test-strings.cc
diff --git a/test/cctest/test-strings.cc b/test/cctest/test-strings.cc
index 4aa74a8191c79572ed69bac95d0c168495f22278..333e2a60732bc072ba14487704076ddbbfa5d8fb 100644
--- a/test/cctest/test-strings.cc
+++ b/test/cctest/test-strings.cc
@@ -1213,7 +1213,7 @@ TEST(AsciiArrayJoin) {
   v8::ResourceConstraints constraints;
   constraints.set_max_young_space_size(256 * K);
   constraints.set_max_old_space_size(4 * K * K);
-  v8::SetResourceConstraints(&constraints);
+  v8::SetResourceConstraints(CcTest::isolate(), &constraints);

   // String s is made of 2^17 = 131072 'c' characters and a is an array
// starting with 'bad', followed by 2^14 times the string s. That means the


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to