Splitting debugger breakpoints into two parts

runtime/vm/debugger_api_impl.cc

 // Copyright (c) 2011, 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 126 matching lines @@
 
   const char* msg = CheckIsolateState(isolate);
   if (msg != NULL) {
     return Api::NewError(msg);
   }
 
   Dart_Handle result = Api::True();
   *breakpoint = NULL;
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
-  Error& error = Error::Handle();
-  Breakpoint* bpt = debugger->SetBreakpointAtLine(script_url, line, &error);
+  SourceBreakpoint* bpt =
+      debugger->SetBreakpointAtLine(script_url, line);
   if (bpt == NULL) {
-    if (!error.IsNull()) {
-      // If SetBreakpointAtLine provided an error message, use it.
-      result =  Api::NewLocalHandle(error);
-    } else {
-      result = Api::NewError("%s: could not set breakpoint at line %d of '%s'",
+    result = Api::NewError("%s: could not set breakpoint at line %d of '%s'",
                              CURRENT_FUNC, line, script_url.ToCString());
-    }
   } else {
     *breakpoint = reinterpret_cast<Dart_Breakpoint>(bpt);
   }
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetBreakpointAtEntry(
                             Dart_Handle library_in,
                             Dart_Handle class_name_in,
@@ skipping 24 matching lines @@
     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();
   *breakpoint = NULL;
 
-  Error& error = Error::Handle();
-  Breakpoint* bpt = debugger->SetBreakpointAtEntry(bp_target, &error);
-  if (!error.IsNull()) {
-    return Api::NewLocalHandle(error);
-  }
+  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 result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_DeleteBreakpoint(
                             Dart_Breakpoint breakpoint_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
 
-  CHECK_AND_CAST(Breakpoint, breakpoint, breakpoint_in);
+  CHECK_AND_CAST(SourceBreakpoint, breakpoint, breakpoint_in);
   isolate->debugger()->RemoveBreakpoint(breakpoint);
   return Api::True();
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetStepOver() {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   isolate->debugger()->SetStepOver();
   return Api::True();
@@ skipping 133 matching lines @@
   for (int i = 0; i < num_libs; i++) {
     ASSERT(!lib.IsNull());
     lib_url = lib.url();
     library_list.SetAt(i, lib_url);
     lib = lib.next_registered();
   }
   return Api::NewLocalHandle(library_list);
 }
 
 }  // namespace dart