Transmit breakpoint id on paused event

runtime/vm/debugger.cc

Index: runtime/vm/debugger.cc
===================================================================
--- runtime/vm/debugger.cc	(revision 31028)
+++ runtime/vm/debugger.cc	(working copy)
@@ -155,8 +155,7 @@
   if (event_handler_ != NULL) {
     Debugger* debugger = Isolate::Current()->debugger();
     ASSERT(debugger != NULL);
-    DebuggerEvent event;
-    event.type = type;
+    DebuggerEvent event(type);
     event.isolate_id = debugger->GetIsolateId();
     ASSERT(event.isolate_id != ILLEGAL_ISOLATE_ID);
     if (type == kIsolateInterrupted) {
@@ -1044,8 +1043,7 @@
 
 void Debugger::SignalBpResolved(SourceBreakpoint* bpt) {
   if (event_handler_ != NULL) {
-    DebuggerEvent event;
-    event.type = kBreakpointResolved;
+    DebuggerEvent event(kBreakpointResolved);
     event.breakpoint = bpt;
     (*event_handler_)(&event);
   }
@@ -1390,8 +1388,7 @@
   ASSERT(obj_cache_ == NULL);
   in_event_notification_ = true;
   obj_cache_ = new RemoteObjectCache(64);
-  DebuggerEvent event;
-  event.type = kExceptionThrown;
+  DebuggerEvent event(kExceptionThrown);
   event.exception = &exc;
   (*event_handler_)(&event);
   in_event_notification_ = false;
@@ -1883,16 +1880,17 @@
 }
 
 
-void Debugger::SignalPausedEvent(ActivationFrame* top_frame) {
+void Debugger::SignalPausedEvent(ActivationFrame* top_frame,
+                                 SourceBreakpoint* bpt) {
   resume_action_ = kContinue;
   isolate_->set_single_step(false);
   ASSERT(!in_event_notification_);
   ASSERT(obj_cache_ == NULL);
   in_event_notification_ = true;
   obj_cache_ = new RemoteObjectCache(64);
-  DebuggerEvent event;
-  event.type = kBreakpointReached;
+  DebuggerEvent event(kBreakpointReached);
   event.top_frame = top_frame;
+  event.breakpoint = bpt;
   (*event_handler_)(&event);
   in_event_notification_ = false;
   obj_cache_ = NULL;  // Remote object cache is zone allocated.
@@ -1929,7 +1927,7 @@
   }
 
   stack_trace_ = CollectStackTrace();
-  SignalPausedEvent(frame);
+  SignalPausedEvent(frame, NULL);
 
   RemoveInternalBreakpoints();
   if (resume_action_ == kStepOver) {
@@ -1975,7 +1973,7 @@
 
   if (report_bp && (event_handler_ != NULL)) {
     stack_trace_ = stack_trace;
-    SignalPausedEvent(top_frame);
+    SignalPausedEvent(top_frame, bpt->src_bpt_);
     stack_trace_ = NULL;
   }