Index: src/d8.cc |
diff --git a/src/d8.cc b/src/d8.cc |
index f20a41aa5fc7bb56a3feab434c46e717d0a0e44a..c716c1ccd341cd15698b1ad938ed8021fb302941 100644 |
--- a/src/d8.cc |
+++ b/src/d8.cc |
@@ -1053,7 +1053,7 @@ void Shell::InstallUtilityScript() { |
i::Debug* debug = i::Isolate::Current()->debug(); |
debug->Load(); |
i::Handle<i::JSObject> js_debug |
- = i::Handle<i::JSObject>(debug->debug_context()->global_object()); |
+ = i::Handle<i::JSObject>(debug->debug_context()->global()); |
utility_context_->Global()->Set(String::New("$debug"), |
Utils::ToLocal(js_debug)); |
debug->debug_context()->set_security_token(HEAP->undefined_value()); |
@@ -1589,11 +1589,6 @@ void SourceGroup::ExecuteInThread() { |
Execute(); |
} |
context.Dispose(); |
- if (Shell::options.send_idle_notification) { |
- const int kLongIdlePauseInMs = 1000; |
- V8::ContextDisposedNotification(); |
- V8::IdleNotification(kLongIdlePauseInMs); |
- } |
} |
if (done_semaphore_ != NULL) done_semaphore_->Signal(); |
} while (!Shell::options.last_run); |
@@ -1639,9 +1634,6 @@ bool Shell::SetOptions(int argc, char* argv[]) { |
} else if (strcmp(argv[i], "--test") == 0) { |
options.test_shell = true; |
argv[i] = NULL; |
- } else if (strcmp(argv[i], "--send-idle-notification") == 0) { |
- options.send_idle_notification = true; |
- argv[i] = NULL; |
} else if (strcmp(argv[i], "--preemption") == 0) { |
#ifdef V8_SHARED |
printf("D8 with shared library does not support multi-threading\n"); |
@@ -1798,11 +1790,13 @@ int Shell::RunMain(int argc, char* argv[]) { |
} |
if (!options.last_run) { |
context.Dispose(); |
- if (options.send_idle_notification) { |
+#if !defined(V8_SHARED) |
+ if (i::FLAG_send_idle_notification) { |
const int kLongIdlePauseInMs = 1000; |
V8::ContextDisposedNotification(); |
V8::IdleNotification(kLongIdlePauseInMs); |
} |
+#endif // !V8_SHARED |
} |
#ifndef V8_SHARED |