Add library id, location info to breakpointResolved event

runtime/bin/dbg_message.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 "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 1139 matching lines @@
       iterator = queue;
       queue = queue->next();
     }
   }
   UNREACHABLE();
 }
 
 
 void DbgMsgQueueList::BptResolvedHandler(Dart_IsolateId isolate_id,
                                          intptr_t bp_id,
-                                         Dart_Handle url,
-                                         intptr_t line_number) {
+                                         const Dart_CodeLocation& location) {
   Dart_EnterScope();
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"breakpointResolved\", \"params\": {");
-  msg.Printf("\"breakpointId\": %"Pd", \"url\":", bp_id);
-  FormatEncodedString(&msg, url);
-  msg.Printf(",\"line\": %"Pd" }}", line_number);
+  msg.Printf("\"breakpointId\": %"Pd"", bp_id);
+
+  // TODO(hausner): remove url and line elements.
+  msg.Printf(", \"url\":");
+  FormatEncodedString(&msg, location.script_url);
+  int line_number = GetIntValue(Dart_GetBreakpointLine(bp_id));
+  msg.Printf(",\"line\":%d", line_number);
+
+  msg.Printf(", \"isolateId\":%"Pd64"", isolate_id);
+  ASSERT(!Dart_IsNull(location.script_url));
+  ASSERT(Dart_IsString(location.script_url));
+  msg.Printf(", \"location\":{\"url\":");
+  FormatEncodedString(&msg, location.script_url);
+  msg.Printf(",\"libraryId\":%d", location.library_id);
+  msg.Printf(",\"tokenOffset\":%d}}}", location.token_pos);
+
   DbgMsgQueue* msg_queue = GetIsolateMsgQueue(isolate_id);
   ASSERT(msg_queue != NULL);
   msg_queue->QueueOutputMsg(&msg);
   Dart_ExitScope();
 }
 
 
 void DbgMsgQueueList::PausedEventHandler(Dart_IsolateId isolate_id,
                                          const Dart_CodeLocation& loc) {
   DebuggerConnectionHandler::WaitForConnection();
@@ skipping 35 matching lines @@
     msg_queue->SendIsolateEvent(isolate_id, kind);
     if (kind == kInterrupted) {
       msg_queue->HandleMessages();
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }