third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp - Issue 2194063002: [DevTools] Move canExecuteScript to V8DebuggerClient.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

Issue 2194063002: [DevTools] Move canExecuteScript to V8DebuggerClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 | « third_party/WebKit/Source/core/inspector/MainThreadDebugger.h ('k') | third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

diff --git a/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp b/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

index 0bf14219daeeec4816beb2971545c36d835153e9..7ab776bcd6f405c69597116faf4552edc2ce00bf 100644

--- a/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

+++ b/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

@@ -262,6 +262,12 @@ void MainThreadDebugger::endEnsureAllContextsInGroup(int contextGroupId)

frame->settings()->setForceMainWorldInitialization(false);

}

+bool MainThreadDebugger::canExecuteScripts(int contextGroupId)

+ LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId);

kozy 2016/08/01 18:08:03 Could it return nullptr?

dgozman 2016/08/01 18:43:04 Nope. If it does, we crash. That's expected.

+ return frame->script().canExecuteScripts(NotAboutToExecuteScript);

void MainThreadDebugger::consoleAPIMessage(int contextGroupId, V8ConsoleAPIType type, const String16& message, const String16& url, unsigned lineNumber, unsigned columnNumber, V8StackTrace* stackTrace)

{

LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId);