More cleanups in debugger API and wire protocol

runtime/vm/debugger_api_impl.cc

 // Copyright (c) 2012, 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 "include/dart_debugger_api.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/debugger.h"
 #include "vm/isolate.h"
@@ skipping 206 matching lines @@
   if (library_id != NULL) {
     const Library& lib = Library::Handle(frame->Library());
     *library_id = lib.index();
   }
   return Api::True(isolate);
 }
 
 
 DART_EXPORT Dart_Handle Dart_ActivationFrameGetLocation(
                             Dart_ActivationFrame activation_frame,
-                            Dart_Handle* script_url,
-                            intptr_t* library_id,
-                            intptr_t* token_number) {
-  // TODO(hausner): Implement implement a way to recognize when there
+                            Dart_Handle* function_name,
+                            Dart_CodeLocation* location) {
+  // TODO(hausner): Implement a way to recognize when there
   // is no source code for the code in the frame.
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_AND_CAST(ActivationFrame, frame, activation_frame);
-  if (script_url != NULL) {
-    *script_url = Api::NewHandle(isolate, frame->SourceUrl());
+  if (function_name != NULL) {
+    *function_name = Api::NewHandle(isolate, frame->QualifiedFunctionName());
   }
-  if (library_id != NULL) {
+
+  if (location != NULL) {
+    location->script_url = Api::NewHandle(isolate, frame->SourceUrl());
     const Library& lib = Library::Handle(frame->Library());
-    *library_id = lib.index();
-  }
-  if (token_number != NULL) {
-    *token_number = frame->TokenPos();
+    location->library_id = lib.index();
+    location->token_pos = frame->TokenPos();
   }
   return Api::True(isolate);
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetLocalVariables(
                             Dart_ActivationFrame activation_frame) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_AND_CAST(ActivationFrame, frame, activation_frame);
@@ skipping 492 matching lines @@
 
 
 DART_EXPORT char* Dart_GetVmStatus(const char* request) {
   if (strncmp(request, "/isolate/", 9) == 0) {
     return Isolate::GetStatus(request);
   }
   return NULL;
 }
 
 }  // namespace dart