Sundry service protocol cleanups before version 1.0.

runtime/vm/service_event.cc

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/service_event.h"
 
 namespace dart {
 
 // Translate from the legacy DebugEvent to a ServiceEvent.
 static ServiceEvent::EventType TranslateEventType(
@@ skipping 84 matching lines @@
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "ServiceEvent");
   jsobj.AddProperty("eventType", EventTypeToCString(type()));
   jsobj.AddProperty("isolate", isolate());
   if (breakpoint() != NULL) {
     jsobj.AddProperty("breakpoint", breakpoint());
   }
   if (top_frame() != NULL) {
     JSONObject jsFrame(&jsobj, "topFrame");
     top_frame()->PrintToJSONObject(&jsFrame);
+    intptr_t index = 0;  // Avoid ambiguity in call to AddProperty.
+    jsFrame.AddProperty("index", index);
   }
   if (exception() != NULL) {
     jsobj.AddProperty("exception", *(exception()));
   }
   if (inspectee() != NULL) {
     jsobj.AddProperty("inspectee", *(inspectee()));
   }
   if (gc_stats() != NULL) {
     jsobj.AddProperty("reason", Heap::GCReasonToString(gc_stats()->reason_));
     isolate()->heap()->PrintToJSONObject(Heap::kNew, &jsobj);
     isolate()->heap()->PrintToJSONObject(Heap::kOld, &jsobj);
   }
 }
 
 }  // namespace dart