Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(490)

Unified Diff: runtime/lib/developer.cc

Issue 1978603002: Remove DebuggerEvent. Refactor remaining code. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: before landing Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/vm/code_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/lib/developer.cc
diff --git a/runtime/lib/developer.cc b/runtime/lib/developer.cc
index e47e8effdfd5b13433a3cf72c77d4baf6e9ae9c1..bfce3e59ee113eb2eefdc27e9386aaec05f1d481 100644
--- a/runtime/lib/developer.cc
+++ b/runtime/lib/developer.cc
@@ -13,6 +13,7 @@
#include "vm/object.h"
#include "vm/object_store.h"
#include "vm/service.h"
+#include "vm/service_isolate.h"
namespace dart {
@@ -26,7 +27,7 @@ DEFINE_NATIVE_ENTRY(Developer_debugger, 2) {
return when.raw();
}
if (when.value()) {
- debugger->BreakHere(msg);
+ debugger->PauseDeveloper(msg);
}
return when.raw();
}
@@ -92,7 +93,13 @@ DEFINE_NATIVE_ENTRY(Developer_registerExtension, 2) {
}
GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(0));
GET_NON_NULL_NATIVE_ARGUMENT(Instance, handler, arguments->NativeArgAt(1));
- isolate->RegisterServiceExtensionHandler(name, handler);
+ // We don't allow service extensions to be registered for the
+ // service isolate. This can happen, for example, because the
+ // service isolate uses dart:io. If we decide that we want to start
+ // supporting this in the future, it will take some work.
+ if (!ServiceIsolate::IsServiceIsolateDescendant(isolate)) {
+ isolate->RegisterServiceExtensionHandler(name, handler);
+ }
return Object::null();
}
« no previous file with comments | « no previous file | runtime/vm/code_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698