Source/core/inspector/PageRuntimeAgent.cpp - Issue 336553003: Change Page::m_mainFrame to be a Frame.

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: Source/core/inspector/PageRuntimeAgent.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

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

Index: Source/core/inspector/PageRuntimeAgent.cpp

diff --git a/Source/core/inspector/PageRuntimeAgent.cpp b/Source/core/inspector/PageRuntimeAgent.cpp

index 97987168cd29596678b7890bd8a8e17942843bba..9092f01a2ed3ded6c49a796388f58d74224be5e9 100644

--- a/Source/core/inspector/PageRuntimeAgent.cpp

+++ b/Source/core/inspector/PageRuntimeAgent.cpp

@@ -105,7 +105,7 @@ void PageRuntimeAgent::didCreateIsolatedContext(LocalFrame* frame, ScriptState*

InjectedScript PageRuntimeAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)

{

if (!executionContextId) {

- ScriptState* scriptState = ScriptState::forMainWorld(m_inspectedPage->mainFrame());

+ ScriptState* scriptState = ScriptState::forMainWorld(m_inspectedPage->deprecatedLocalMainFrame());

InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);

if (result.isEmpty())

*errorString = "Internal error: main world execution context not found.";