Revert "Per-closure breakpoints; restructure breakpoint implementation to keep a list of conditions…

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/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
@@ skipping 112 matching lines @@
       location.token_pos = top_frame->TokenPos();
       intptr_t bp_id = 0;
       if (event->breakpoint() != NULL) {
         ASSERT(event->breakpoint()->id() != ILLEGAL_BREAKPOINT_ID);
         bp_id = event->breakpoint()->id();
       }
       (*paused_event_handler)(isolate_id, bp_id, location);
     }
   } else if (event->type() == DebuggerEvent::kBreakpointResolved) {
     if (bp_resolved_handler != NULL) {
-      Breakpoint* bpt = event->breakpoint();
+      SourceBreakpoint* bpt = event->breakpoint();
       ASSERT(bpt != NULL);
       Dart_CodeLocation location;
       Library& library = Library::Handle(isolate);
       Script& script = Script::Handle(isolate);
       intptr_t token_pos;
-      bpt->bpt_location()->GetCodeLocation(&library, &script, &token_pos);
+      bpt->GetCodeLocation(&library, &script, &token_pos);
       location.script_url = Api::NewHandle(isolate, script.url());
       location.library_id = library.index();
       location.token_pos = token_pos;
       (*bp_resolved_handler)(isolate_id, bpt->id(), location);
     }
   } else if (event->type() == DebuggerEvent::kExceptionThrown) {
     if (exc_thrown_handler != NULL) {
       Dart_Handle exception =
           Api::NewHandle(isolate, event->exception()->raw());
       Dart_StackTrace trace =
@@ skipping 184 matching lines @@
 
 DART_EXPORT Dart_Handle Dart_SetBreakpoint(
                             Dart_Handle script_url_in,
                             intptr_t line_number) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(String, script_url, script_url_in);
 
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
-  Breakpoint* bpt =
+  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());
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetBreakpointURL(intptr_t bp_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
 
-  Breakpoint* bpt = debugger->GetBreakpointById(bp_id);
+  SourceBreakpoint* bpt = debugger->GetBreakpointById(bp_id);
   if (bpt == NULL) {
     return Api::NewError("%s: breakpoint with id %" Pd " does not exist",
                            CURRENT_FUNC, bp_id);
   }
-  return Api::NewHandle(isolate, bpt->bpt_location()->url());
+  return Api::NewHandle(isolate, bpt->url());
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetBreakpointLine(intptr_t bp_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
 
-  Breakpoint* bpt = debugger->GetBreakpointById(bp_id);
+  SourceBreakpoint* bpt = debugger->GetBreakpointById(bp_id);
   if (bpt == NULL) {
     return Api::NewError("%s: breakpoint with id %" Pd " does not exist",
                          CURRENT_FUNC, bp_id);
   }
-  return Dart_NewInteger(bpt->bpt_location()->LineNumber());
+  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) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Library, library, library_in);
@@ skipping 13 matching lines @@
       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());
   }
 
-  Breakpoint* bpt = debugger->SetBreakpointAtEntry(bp_target, false);
+  SourceBreakpoint* bpt = debugger->SetBreakpointAtEntry(bp_target);
   if (bpt == NULL) {
     const char* target_name = Debugger::QualifiedFunctionName(bp_target);
     return Api::NewError("%s: no breakpoint location found in '%s'",
                          CURRENT_FUNC, target_name);
   }
   return Dart_NewInteger(bpt->id());
 }
 
 
 DART_EXPORT Dart_Handle Dart_OneTimeBreakAtEntry(
@@ skipping 555 matching lines @@
   return Api::CastIsolate(isolate);
 }
 
 
 DART_EXPORT Dart_IsolateId Dart_GetIsolateId(Dart_Isolate dart_isolate) {
   Isolate* isolate = reinterpret_cast<Isolate*>(dart_isolate);
   return isolate->debugger()->GetIsolateId();
 }
 
 }  // namespace dart