Transmit breakpoint id on paused 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 1048 matching lines @@
 
 
 void DbgMsgQueue::SendQueuedMsgs() {
   if (queued_output_messages_.length() > 0) {
     DebuggerConnectionHandler::BroadcastMsg(&queued_output_messages_);
     queued_output_messages_.Clear();
   }
 }
 
 
-void DbgMsgQueue::SendBreakpointEvent(const Dart_CodeLocation& location) {
+void DbgMsgQueue::SendBreakpointEvent(intptr_t bp_id,
+                                      const Dart_CodeLocation& location) {
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": { ");
   msg.Printf("\"reason\": \"breakpoint\", ");
   msg.Printf("\"isolateId\": %" Pd64 "", isolate_id_);
+  if (bp_id != ILLEGAL_BREAKPOINT_ID) {
+    msg.Printf(",\"breakpointId\": %" Pd "", bp_id);
+  }
   if (!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);
   }
   msg.Printf("}}");
   DebuggerConnectionHandler::BroadcastMsg(&msg);
 }
@@ skipping 190 matching lines @@
   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,
+                                         intptr_t bp_id,
                                          const Dart_CodeLocation& loc) {
   DebuggerConnectionHandler::WaitForConnection();
   Dart_EnterScope();
   DbgMsgQueue* msg_queue = GetIsolateMsgQueue(isolate_id);
   ASSERT(msg_queue != NULL);
   msg_queue->SendQueuedMsgs();
-  msg_queue->SendBreakpointEvent(loc);
+  msg_queue->SendBreakpointEvent(bp_id, loc);
   msg_queue->HandleMessages();
   Dart_ExitScope();
 }
 
 
 void DbgMsgQueueList::ExceptionThrownHandler(Dart_IsolateId isolate_id,
                                              Dart_Handle exception,
                                              Dart_StackTrace stack_trace) {
   DebuggerConnectionHandler::WaitForConnection();
   Dart_EnterScope();
@@ skipping 23 matching lines @@
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }
 
 }  // namespace bin
 }  // namespace dart