third_party/WebKit/Source/modules/mediastream/MediaStream.cpp - Issue 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5)

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/modules/mediastream/MediaStream.cpp

Issue 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5) (Closed)

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

Index: third_party/WebKit/Source/modules/mediastream/MediaStream.cpp

diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp

index 2b52b45d4c741125ff54e362420d572ba2a036ae..8ca5d1a808d956a190f9641e642ebdb9fdc96451 100644

--- a/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp

+++ b/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp

@@ -278,7 +278,7 @@ MediaStreamTrack* MediaStream::getTrackById(String id) {

MediaStream* MediaStream::clone(ScriptState* script_state) {

MediaStreamTrackVector tracks;

- ExecutionContext* context = ExecutionContext::From(script_state);

+ ExecutionContext* context = script_state->GetExecutionContext();

for (MediaStreamTrackVector::iterator iter = audio_tracks_.begin();

iter != audio_tracks_.end(); ++iter)

tracks.push_back((*iter)->clone(script_state));