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

Unified Diff: runtime/vm/service.cc

Issue 1153193006: Standardize on using "kind" to distinguish sub-varieties of a type. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: doc changes Created 5 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 | « runtime/vm/object_test.cc ('k') | runtime/vm/service/service.md » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/service.cc
diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
index 68a85b9d84321fd85591dd1e5052e2e901cd2a1d..7318e4374805ddfaa28015798b40a3f47a64da1a 100644
--- a/runtime/vm/service.cc
+++ b/runtime/vm/service.cc
@@ -763,7 +763,7 @@ void Service::SendEchoEvent(Isolate* isolate, const char* text) {
{
JSONObject event(&jsobj, "event");
event.AddProperty("type", "Event");
- event.AddProperty("eventType", "_Echo");
+ event.AddProperty("kind", "_Echo");
event.AddProperty("isolate", isolate);
if (text != NULL) {
event.AddProperty("text", text);
@@ -851,10 +851,6 @@ static RawObject* LookupObjectId(Isolate* isolate,
return Bool::False().raw();
} else if (strcmp(arg, "null") == 0) {
return Object::null();
- } else if (strcmp(arg, "not-initialized") == 0) {
- return Object::sentinel().raw();
- } else if (strcmp(arg, "being-initialized") == 0) {
- return Object::transition_sentinel().raw();
}
ObjectIdRing* ring = isolate->object_id_ring();
@@ -1883,7 +1879,6 @@ static bool RemoveBreakpoint(Isolate* isolate, JSONStream* js) {
const char* bpt_id = js->LookupParam("breakpointId");
Breakpoint* bpt = LookupBreakpoint(isolate, bpt_id);
if (bpt == NULL) {
- fprintf(stderr, "ERROR1");
PrintInvalidParamError(js, "breakpointId");
return true;
}
@@ -2288,7 +2283,7 @@ void Service::SendGraphEvent(Isolate* isolate) {
{
JSONObject event(&jsobj, "event");
event.AddProperty("type", "Event");
- event.AddProperty("eventType", "_Graph");
+ event.AddProperty("kind", "_Graph");
event.AddProperty("isolate", isolate);
event.AddProperty("chunkIndex", i);
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/service/service.md » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698