third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp - Issue 1622213002: DevTools: make InjectedScript heap-allocated.

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/InspectorRuntimeAgent.cpp

Issue 1622213002: DevTools: make InjectedScript heap-allocated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed protocol tests. Created 4 years, 11 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/InspectorHeapProfilerAgent.cpp ('k') | third_party/WebKit/Source/core/inspector/PageDebuggerAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 133c086906267601c25cf8e1f172af0d5540d6d7..49512c025568019aa5c60fc0b1e50d8f1149bd6b 100644

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

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

@@ -90,7 +90,14 @@ void InspectorRuntimeAgent::restore()

void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* optExecutionContextId, const bool* const returnByValue, const bool* generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>& exceptionDetails)

{

- int executionContextId = optExecutionContextId ? *optExecutionContextId : m_injectedScriptManager->injectedScriptFor(defaultScriptState()).contextId();

+ int executionContextId;

+ if (optExecutionContextId) {

+ executionContextId = *optExecutionContextId;

+ } else {

+ InjectedScript* injectedScript = m_injectedScriptManager->injectedScriptFor(defaultScriptState());

+ ASSERT(injectedScript);

+ executionContextId = injectedScript->contextId();

+ }

MuteConsoleScope<InspectorRuntimeAgent> muteScope;

if (asBool(doNotPauseOnExceptionsAndMuteConsole))

muteScope.enter(this);