Deprecate old debugger breakpoint handler

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 961 matching lines @@
 
 
 void DbgMsgQueue::SendQueuedMsgs() {
   if (queued_output_messages_.length() > 0) {
     DebuggerConnectionHandler::BroadcastMsg(&queued_output_messages_);
     queued_output_messages_.Clear();
   }
 }
 
 
-// TODO(hausner): Remove stack trace parameter once we remove the stack
-// trace from the paused event in the wire protocol.
-void DbgMsgQueue::SendBreakpointEvent(Dart_StackTrace trace) {
+void DbgMsgQueue::SendBreakpointEvent(const Dart_CodeLocation& location) {
   dart::TextBuffer msg(128);
   msg.Printf("{ \"event\": \"paused\", \"params\": { ");
   msg.Printf("\"reason\": \"breakpoint\", ");
   msg.Printf("\"isolateId\": %"Pd64"", isolate_id_);
-  FormatLocationFromTrace(&msg, trace, ", ");
+  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);
 }
 
 
 // TODO(hausner): Remove stack trace parameter once we remove the stack
 // trace from the paused event in the wire protocol.
 void DbgMsgQueue::SendExceptionEvent(Dart_Handle exception,
                                      Dart_StackTrace stack_trace) {
   intptr_t exception_id = Dart_CacheObject(exception);
@@ skipping 40 matching lines @@
 
 
 DbgMsgQueue* DbgMsgQueueList::list_ = NULL;
 dart::Mutex DbgMsgQueueList::msg_queue_list_lock_;
 
 
 void DbgMsgQueueList::Initialize() {
   // Setup handlers for isolate events, breakpoints, exceptions and
   // delayed breakpoints.
   Dart_SetIsolateEventHandler(IsolateEventHandler);
-  Dart_SetBreakpointHandler(BreakpointHandler);
+  Dart_SetPausedEventHandler(PausedEventHandler);
   Dart_SetBreakpointResolvedHandler(BptResolvedHandler);
   Dart_SetExceptionThrownHandler(ExceptionThrownHandler);
 }
 
 
 int32_t DbgMsgQueueList::LookupIsolateCommand(const char* buf,
                                               int32_t buflen) {
   // Check if we have a isolate specific debugger command.
   int32_t i = 0;
   while (debugger_commands[i].cmd_string != NULL) {
@@ skipping 100 matching lines @@
   msg.Printf("\"breakpointId\": %"Pd", \"url\":", bp_id);
   FormatEncodedString(&msg, url);
   msg.Printf(",\"line\": %"Pd" }}", line_number);
   DbgMsgQueue* msg_queue = GetIsolateMsgQueue(isolate_id);
   ASSERT(msg_queue != NULL);
   msg_queue->QueueOutputMsg(&msg);
   Dart_ExitScope();
 }
 
 
-void DbgMsgQueueList::BreakpointHandler(Dart_IsolateId isolate_id,
-                                        Dart_Breakpoint bpt,
-                                        Dart_StackTrace trace) {
+void DbgMsgQueueList::PausedEventHandler(Dart_IsolateId isolate_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(trace);
+  msg_queue->SendBreakpointEvent(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 20 matching lines @@
     msg_queue->SendIsolateEvent(isolate_id, kind);
     if (kind == kInterrupted) {
       msg_queue->HandleMessages();
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }