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

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

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

Patch Set: 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

« third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp ('K') | « third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp ('k') | third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9065b2e61e388a4de7bc40b15315cfa63f805040..5e041269259ba58b8ad0e82c0bf63dab2d739b64 100644

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

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

@@ -132,12 +132,12 @@ void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame)

void PageDebuggerAgent::compileScript(ErrorString* errorString, const String& expression, const String& sourceURL, bool persistScript, int executionContextId, TypeBuilder::OptOutput<ScriptId>* scriptId, RefPtr<ExceptionDetails>& exceptionDetails)

{

- InjectedScript injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId);

- if (injectedScript.isEmpty()) {

+ InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId);

+ if (!injectedScript) {

*errorString = "Inspected frame has gone";

return;

}

- ExecutionContext* executionContext = injectedScript.scriptState()->executionContext();

+ ExecutionContext* executionContext = injectedScript->scriptState()->executionContext();

RefPtrWillBeRawPtr<LocalFrame> protect(toDocument(executionContext)->frame());

InspectorDebuggerAgent::compileScript(errorString, expression, sourceURL, persistScript, executionContextId, scriptId, exceptionDetails);

if (!scriptId->isAssigned())

@@ -150,12 +150,12 @@ void PageDebuggerAgent::compileScript(ErrorString* errorString, const String& ex

void PageDebuggerAgent::runScript(ErrorString* errorString, const ScriptId& scriptId, int executionContextId, const String* const objectGroup, const bool* const doNotPauseOnExceptionsAndMuteConsole, RefPtr<RemoteObject>& result, RefPtr<ExceptionDetails>& exceptionDetails)

{