Sundry service protocol cleanups before version 1.0.

runtime/vm/service.cc

 // Copyright (c) 2013, 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.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 715 matching lines @@
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "Stack");
   {
     JSONArray jsarr(&jsobj, "frames");
 
     intptr_t num_frames = stack->Length();
     for (intptr_t i = 0; i < num_frames; i++) {
       ActivationFrame* frame = stack->FrameAt(i);
       JSONObject jsobj(&jsarr);
       frame->PrintToJSONObject(&jsobj, full);
-      // TODO(turnidge): Implement depth differently -- differentiate
-      // inlined frames.
-      jsobj.AddProperty("depth", i);
+      jsobj.AddProperty("index", i);
     }
   }
 
   {
     MessageHandler::AcquiredQueues aq;
     isolate->message_handler()->AcquireQueues(&aq);
     jsobj.AddProperty("messages", aq.queue());
   }
 
   return true;
@@ skipping 800 matching lines @@
   js->PrintError(kInvalidParams,
                  "%s: invalid 'targetId' parameter: "
                  "id '%s' does not correspond to a "
                  "library, class, or instance", js->method(), target_id);
   return true;
 }
 
 
 static const MethodParameter* evaluate_in_frame_params[] = {
   ISOLATE_PARAMETER,
-  new UIntParameter("frame", true),
+  new UIntParameter("frameIndex", true),
   new MethodParameter("expression", true),
   NULL,
 };
 
 
 static bool EvaluateInFrame(Isolate* isolate, JSONStream* js) {
   DebuggerStackTrace* stack = isolate->debugger()->StackTrace();
-  intptr_t framePos = UIntParameter::Parse(js->LookupParam("frame"));
+  intptr_t framePos = UIntParameter::Parse(js->LookupParam("frameIndex"));
   if (framePos > stack->Length()) {
-    PrintInvalidParamError(js, "frame");
+    PrintInvalidParamError(js, "frameIndex");
     return true;
   }
   ActivationFrame* frame = stack->FrameAt(framePos);
 
   const char* expr = js->LookupParam("expression");
   const String& expr_str = String::Handle(isolate, String::New(expr));
 
   const Object& result = Object::Handle(frame->Evaluate(expr_str));
   result.PrintJSON(js, true);
   return true;
@@ skipping 1112 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart