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

Unified Diff: src/debug.cc

Issue 325183003: Ignore live_edit_ flag when when dealing with LiveEdit in a debug break. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 6 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.h ('k') | src/liveedit.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/debug.cc
diff --git a/src/debug.cc b/src/debug.cc
index 03c91979e929e2bd3be49e9e6abfd30e78d04023..a710f0ba558694c7d5db3d2d1750239643145a97 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -886,9 +886,8 @@ void Debug::Break(Arguments args, JavaScriptFrame* frame) {
HandleScope scope(isolate_);
ASSERT(args.length() == 0);
- if (live_edit_enabled()) {
- thread_local_.frame_drop_mode_ = LiveEdit::FRAMES_UNTOUCHED;
- }
+ // Initialize LiveEdit.
+ LiveEdit::InitializeThreadLocal(this);
// Just continue if breaks are disabled or debugger cannot be loaded.
if (break_disabled_) return;
@@ -2307,11 +2306,9 @@ void Debug::RemoveDebugInfo(Handle<DebugInfo> debug_info) {
void Debug::SetAfterBreakTarget(JavaScriptFrame* frame) {
- if (live_edit_enabled()) {
- after_break_target_ =
- LiveEdit::AfterBreakTarget(thread_local_.frame_drop_mode_, isolate_);
- if (after_break_target_ != NULL) return; // LiveEdit did the job.
- }
+ after_break_target_ = NULL;
+
+ if (LiveEdit::SetAfterBreakTarget(this)) return; // LiveEdit did the job.
HandleScope scope(isolate_);
PrepareForBreakPoints();
« no previous file with comments | « src/debug.h ('k') | src/liveedit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698