Remove legacy debugger API function

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 255 matching lines @@
   SourceBreakpoint* bpt =
       debugger->SetBreakpointAtLine(script_url, line_number);
   if (bpt == NULL) {
     return Api::NewError("%s: could not set breakpoint at line %"Pd" in '%s'",
                          CURRENT_FUNC, line_number, script_url.ToCString());
   }
   return Dart_NewInteger(bpt->id());
 }
 
 
-// TODO(hausner): remove this function.
-DART_EXPORT Dart_Handle Dart_SetBreakpointAtLine(
-                            Dart_Handle script_url_in,
-                            Dart_Handle line_number_in,
-                            Dart_Breakpoint* breakpoint) {
-  Isolate* isolate = Isolate::Current();
-  DARTSCOPE(isolate);
-  UNWRAP_AND_CHECK_PARAM(String, script_url, script_url_in);
-  UNWRAP_AND_CHECK_PARAM(Integer, line_number, line_number_in);
-  CHECK_NOT_NULL(breakpoint);
-
-  if (!line_number.IsSmi()) {
-    return Api::NewError("%s: line number out of range", CURRENT_FUNC);
-  }
-  intptr_t line = line_number.AsInt64Value();
-
-  Dart_Handle state = Api::CheckIsolateState(isolate);
-  if (::Dart_IsError(state)) {
-    return state;
-  }
-
-  Dart_Handle result = Api::True(isolate);
-  *breakpoint = NULL;
-  Debugger* debugger = isolate->debugger();
-  ASSERT(debugger != NULL);
-  SourceBreakpoint* bpt =
-      debugger->SetBreakpointAtLine(script_url, line);
-  if (bpt == NULL) {
-    result = Api::NewError("%s: could not set breakpoint at line %"Pd" of '%s'",
-                           CURRENT_FUNC, line, script_url.ToCString());
-  } else {
-    *breakpoint = reinterpret_cast<Dart_Breakpoint>(bpt);
-  }
-  return result;
-}
-
-
 DART_EXPORT Dart_Handle Dart_GetBreakpointURL(intptr_t bp_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
 
   SourceBreakpoint* bpt = debugger->GetBreakpointById(bp_id);
   if (bpt == NULL) {
     return Api::NewError("%s: breakpoint with id %"Pd" does not exist",
                            CURRENT_FUNC, bp_id);
@@ skipping 13 matching lines @@
     return Api::NewError("%s: breakpoint with id %"Pd" does not exist",
                          CURRENT_FUNC, bp_id);
   }
   return Dart_NewInteger(bpt->LineNumber());
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetBreakpointAtEntry(
                             Dart_Handle library_in,
                             Dart_Handle class_name_in,
-                            Dart_Handle function_name_in,
-                            Dart_Breakpoint* breakpoint) {
+                            Dart_Handle function_name_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Library, library, library_in);
   UNWRAP_AND_CHECK_PARAM(String, class_name, class_name_in);
   UNWRAP_AND_CHECK_PARAM(String, function_name, function_name_in);
-  CHECK_NOT_NULL(breakpoint);
 
   Dart_Handle state = Api::CheckIsolateState(isolate);
   if (::Dart_IsError(state)) {
     return state;
   }
 
   // Resolve the breakpoint target function.
   Debugger* debugger = isolate->debugger();
   const Function& bp_target = Function::Handle(
       debugger->ResolveFunction(library, class_name, function_name));
   if (bp_target.IsNull()) {
     const bool toplevel = class_name.Length() == 0;
     return Api::NewError("%s: could not find function '%s%s%s'",
                          CURRENT_FUNC,
                          toplevel ? "" : class_name.ToCString(),
                          toplevel ? "" : ".",
                          function_name.ToCString());
   }
 
-  Dart_Handle result = Api::True(isolate);
-  *breakpoint = NULL;
-
   SourceBreakpoint* bpt = debugger->SetBreakpointAtEntry(bp_target);
   if (bpt == NULL) {
     const char* target_name = Debugger::QualifiedFunctionName(bp_target);
-    result = Api::NewError("%s: no breakpoint location found in '%s'",
-                             CURRENT_FUNC, target_name);
-  } else {
-    *breakpoint = reinterpret_cast<Dart_Breakpoint>(bpt);
+    return Api::NewError("%s: no breakpoint location found in '%s'",
+                         CURRENT_FUNC, target_name);
   }
-  return result;
+  return Dart_NewInteger(bpt->id());
 }
 
 
 DART_EXPORT Dart_Handle Dart_OneTimeBreakAtEntry(
                             Dart_Handle library_in,
                             Dart_Handle class_name_in,
                             Dart_Handle function_name_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Library, library, library_in);
@@ skipping 16 matching lines @@
                          toplevel ? "" : class_name.ToCString(),
                          toplevel ? "" : ".",
                          function_name.ToCString());
   }
 
   debugger->OneTimeBreakAtEntry(bp_target);
   return Api::True(isolate);
 }
 
 
-
-
-
 DART_EXPORT Dart_Handle Dart_RemoveBreakpoint(intptr_t bp_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
 
   isolate->debugger()->RemoveBreakpoint(bp_id);
   return Api::True(isolate);
 }
 
 
-DART_EXPORT Dart_Handle Dart_DeleteBreakpoint(
-                            Dart_Breakpoint breakpoint_in) {
-  Isolate* isolate = Isolate::Current();
-  DARTSCOPE(isolate);
-
-  CHECK_AND_CAST(SourceBreakpoint, breakpoint, breakpoint_in);
-  isolate->debugger()->RemoveBreakpoint(breakpoint->id());
-  return Api::True(isolate);
-}
-
-
 DART_EXPORT Dart_Handle Dart_SetStepOver() {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   isolate->debugger()->SetStepOver();
   return Api::True(isolate);
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetStepInto() {
   Isolate* isolate = Isolate::Current();
@@ skipping 303 matching lines @@
   DARTSCOPE(isolate);
   const Library& lib = Library::Handle(Library::GetLibrary(library_id));
   if (lib.IsNull()) {
     return Api::NewError("%s: %"Pd" is not a valid library id",
                          CURRENT_FUNC, library_id);
   }
   return Api::NewHandle(isolate, lib.url());
 }
 
 
-DART_EXPORT Dart_Handle Dart_GetLibraryURLs() {
-  Isolate* isolate = Isolate::Current();
-  ASSERT(isolate != NULL);
-  DARTSCOPE(isolate);
-
-  const GrowableObjectArray& libs =
-      GrowableObjectArray::Handle(isolate->object_store()->libraries());
-  int num_libs = libs.Length();
-
-  // Create new list and populate with the url of loaded libraries.
-  Library &lib = Library::Handle();
-  String& lib_url = String::Handle();
-  const Array& library_url_list = Array::Handle(Array::New(num_libs));
-  for (int i = 0; i < num_libs; i++) {
-    lib ^= libs.At(i);
-    ASSERT(!lib.IsNull());
-    lib_url = lib.url();
-    library_url_list.SetAt(i, lib_url);
-  }
-  return Api::NewHandle(isolate, library_url_list.raw());
-}
-
-
 DART_EXPORT Dart_Handle Dart_GetLibraryDebuggable(intptr_t library_id,
                                                   bool* is_debuggable) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   DARTSCOPE(isolate);
   CHECK_NOT_NULL(is_debuggable);
   const Library& lib = Library::Handle(Library::GetLibrary(library_id));
   if (lib.IsNull()) {
     return Api::NewError("%s: %"Pd" is not a valid library id",
                          CURRENT_FUNC, library_id);
@@ skipping 25 matching lines @@
 
 
 DART_EXPORT char* Dart_GetVmStatus(const char* request) {
   if (strncmp(request, "/isolate/", 9) == 0) {
     return Isolate::GetStatus(request);
   }
   return NULL;
 }
 
 }  // namespace dart