Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Unified Diff: runtime/vm/debugger_api_impl.cc

Issue 1145053004: Revert "Per-closure breakpoints; restructure breakpoint implementation to keep a list of conditions… (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/debugger.cc ('k') | runtime/vm/json_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger_api_impl.cc
diff --git a/runtime/vm/debugger_api_impl.cc b/runtime/vm/debugger_api_impl.cc
index fc6a5ea759e833bcf5933011fe28e3c9d91cb2c4..5b1c8680b33e26d9c7ccdea871af7e3b8794a7c5 100644
--- a/runtime/vm/debugger_api_impl.cc
+++ b/runtime/vm/debugger_api_impl.cc
@@ -130,13 +130,13 @@ static void DebuggerEventHandler(DebuggerEvent* event) {
}
} 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;
@@ -341,7 +341,7 @@ DART_EXPORT Dart_Handle Dart_SetBreakpoint(
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'",
@@ -357,12 +357,12 @@ DART_EXPORT Dart_Handle Dart_GetBreakpointURL(intptr_t bp_id) {
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());
}
@@ -372,12 +372,12 @@ DART_EXPORT Dart_Handle Dart_GetBreakpointLine(intptr_t bp_id) {
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());
}
@@ -411,7 +411,7 @@ DART_EXPORT Dart_Handle Dart_SetBreakpointAtEntry(
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'",
« no previous file with comments | « runtime/vm/debugger.cc ('k') | runtime/vm/json_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698