third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.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/encryptedmedia/MediaKeySession.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/csspaint/CSSPaintDefinition.cpp ('k') | third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

index 02128d9c900173584204fb5ef5453db69c960db1..1d2c60483796e7997cd703d9b9bd139f1dba5749 100644

--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

@@ -35,7 +35,6 @@

#include "core/dom/DOMArrayBuffer.h"

#include "core/dom/DOMException.h"

#include "core/dom/ExceptionCode.h"

-#include "core/dom/ExecutionContext.h"

#include "core/dom/TaskRunnerHelper.h"

#include "core/events/Event.h"

#include "core/events/GenericEventQueue.h"

@@ -366,7 +365,7 @@ MediaKeySession* MediaKeySession::Create(

MediaKeySession::MediaKeySession(ScriptState* script_state,

MediaKeys* media_keys,

WebEncryptedMediaSessionType session_type)

- : ContextLifecycleObserver(ExecutionContext::From(script_state)),

+ : ContextLifecycleObserver(script_state->GetExecutionContext()),

async_event_queue_(GenericEventQueue::Create(this)),

media_keys_(media_keys),

session_type_(session_type),

@@ -375,7 +374,7 @@ MediaKeySession::MediaKeySession(ScriptState* script_state,

is_uninitialized_(true),

is_callable_(false),

is_closed_(false),

- closed_promise_(new ClosedPromise(ExecutionContext::From(script_state),

+ closed_promise_(new ClosedPromise(script_state->GetExecutionContext(),

this,

ClosedPromise::kClosed)),

action_timer_(