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

Unified Diff: src/execution.cc

Issue 301633005: Merge Debugger and Debug. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 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 | « src/debug.cc ('k') | src/full-codegen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/execution.cc
diff --git a/src/execution.cc b/src/execution.cc
index 4c6bd93d0626d8ade188292a5f4532658a39d0f0..fb2444c20af96b257c9de1570ef61c0a09efd2b7 100644
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -104,7 +104,7 @@ MUST_USE_RESULT static MaybeHandle<Object> Invoke(
if (has_exception) {
isolate->ReportPendingMessages();
// Reset stepping state when script exits with uncaught exception.
- if (isolate->debugger()->is_active()) {
+ if (isolate->debug()->is_active()) {
isolate->debug()->ClearStepping();
}
return MaybeHandle<Object>();
@@ -662,7 +662,7 @@ void Execution::DebugBreakHelper(Isolate* isolate) {
if (isolate->bootstrapper()->IsActive()) return;
// Ignore debug break if debugger is not active.
- if (!isolate->debugger()->is_active()) return;
+ if (!isolate->debug()->is_active()) return;
StackLimitCheck check(isolate);
if (check.HasOverflowed()) return;
@@ -703,8 +703,8 @@ void Execution::ProcessDebugMessages(Isolate* isolate,
// Notify the debug event listeners. Indicate auto continue if the break was
// a debug command break.
- isolate->debugger()->OnDebugBreak(isolate->factory()->undefined_value(),
- debug_command_only);
+ isolate->debug()->OnDebugBreak(isolate->factory()->undefined_value(),
+ debug_command_only);
}
« no previous file with comments | « src/debug.cc ('k') | src/full-codegen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698