third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp - Issue 2796653003: Move ScriptState::forWorld/ScriptState::forMainWorld (Part 2)

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/origin_trials/OriginTrialContext.cpp

Issue 2796653003: Move ScriptState::forWorld/ScriptState::forMainWorld (Part 2) (Closed)

Patch Set: Rebase Created 3 years, 8 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/loader/modulescript/ModuleScriptLoaderTest.cpp ('k') | third_party/WebKit/Source/core/page/FocusControllerTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

index 6f9317af308b3f9927c822b7ec87cea66fbc59f2..a3ad1b7b2d0c8eae156623daff9f302de112df49 100644

--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

@@ -190,7 +190,7 @@ void OriginTrialContext::initializePendingFeatures() {

LocalFrame* frame = toDocument(supplementable())->frame();

if (!frame)

return;

- ScriptState* scriptState = ScriptState::forMainWorld(frame);

+ ScriptState* scriptState = toScriptStateForMainWorld(frame);

if (!scriptState)

return;

if (!scriptState->contextIsValid())