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

Unified Diff: src/debug/debug.cc

Issue 2723273002: [inspector] introduced Debugger.scheduleStepIntoAsync (Closed)
Patch Set: fixed tests Created 3 years, 10 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/debug.h ('k') | src/debug/debug-interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/debug/debug.cc
diff --git a/src/debug/debug.cc b/src/debug/debug.cc
index bbf2d5568dbf649d8f14d53ab4ed4552189ecbd3..a91900c1d0150bd8dfed305b719964f9b293e2f4 100644
--- a/src/debug/debug.cc
+++ b/src/debug/debug.cc
@@ -1729,12 +1729,7 @@ bool Debug::IsExceptionBlackboxed(bool uncaught) {
// caught exception if top frame is blackboxed.
bool is_top_frame_blackboxed = IsFrameBlackboxed(it.frame());
if (!uncaught || !is_top_frame_blackboxed) return is_top_frame_blackboxed;
- it.Advance();
- while (!it.done()) {
- if (!IsFrameBlackboxed(it.frame())) return false;
- it.Advance();
- }
- return true;
+ return AllFramesOnStackAreBlackboxed();
}
bool Debug::IsFrameBlackboxed(JavaScriptFrame* frame) {
@@ -1989,6 +1984,15 @@ bool Debug::IsBlackboxed(Handle<SharedFunctionInfo> shared) {
return shared->debug_is_blackboxed();
}
+bool Debug::AllFramesOnStackAreBlackboxed() {
+ HandleScope scope(isolate_);
+ for (StackTraceFrameIterator it(isolate_); !it.done(); it.Advance()) {
+ if (!it.is_javascript()) continue;
+ if (!IsFrameBlackboxed(it.javascript_frame())) return false;
+ }
+ return true;
+}
+
void Debug::OnAsyncTaskEvent(debug::PromiseDebugActionType type, int id,
int parent_id) {
if (in_debug_scope() || ignore_events()) return;
@@ -1999,7 +2003,19 @@ void Debug::OnAsyncTaskEvent(debug::PromiseDebugActionType type, int id,
HandleScope scope(isolate_);
PostponeInterruptsScope no_interrupts(isolate_);
DisableBreak no_recursive_break(this);
- debug_delegate_->PromiseEventOccurred(type, id, parent_id);
+ bool created_by_user = false;
+ if (type == debug::kDebugPromiseCreated) {
+ JavaScriptFrameIterator it(isolate_);
+ // We need to skip top frame which contains instrumentation.
+ it.Advance();
+ created_by_user =
+ !it.done() &&
+ it.frame()->function()->shared()->IsSubjectToDebugging() &&
+ !IsFrameBlackboxed(it.frame());
+ }
+ debug_delegate_->PromiseEventOccurred(
+ Utils::ToLocal(debug_scope.GetContext()), type, id, parent_id,
+ created_by_user);
}
void Debug::ProcessCompileEvent(v8::DebugEvent event, Handle<Script> script) {
@@ -2279,7 +2295,8 @@ bool Debug::PerformSideEffectCheckForCallback(Address function) {
}
void LegacyDebugDelegate::PromiseEventOccurred(
- v8::debug::PromiseDebugActionType type, int id, int parent_id) {
+ v8::Local<v8::Context> context, v8::debug::PromiseDebugActionType type,
+ int id, int parent_id, bool created_by_user) {
Handle<Object> event_data;
if (isolate_->debug()->MakeAsyncTaskEvent(type, id).ToHandle(&event_data)) {
ProcessDebugEvent(v8::AsyncTaskEvent, Handle<JSObject>::cast(event_data));
« no previous file with comments | « src/debug/debug.h ('k') | src/debug/debug-interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698