Commit 71475b1e authored by Hajime Hoshi's avatar Hajime Hoshi Committed by Commit Bot

Remove a redundant argument from MediaElementEventQueue

This is a pure refactoring.

Design Doc: https://docs.google.com/document/d/1BBtBPTarOF4NeVKSWZe3XaDHo4yTGhdlqYm35yVzPs4/edit#

Bug: 846618
Change-Id: Ied94509c9d5af1a937142addebbc414da9c0e95f
Reviewed-on: https://chromium-review.googlesource.com/1088449Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Hajime Hoshi <hajimehoshi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564859}
parent 02bf53e3
......@@ -32,15 +32,17 @@
namespace blink {
MediaElementEventQueue* MediaElementEventQueue::Create(
EventTarget* owner,
ExecutionContext* context) {
return new MediaElementEventQueue(owner, context);
MediaElementEventQueue* MediaElementEventQueue::Create(EventTarget* owner) {
return new MediaElementEventQueue(owner);
}
MediaElementEventQueue::MediaElementEventQueue(EventTarget* owner,
ExecutionContext* context)
: ContextLifecycleObserver(context), owner_(owner), is_closed_(false) {}
MediaElementEventQueue::MediaElementEventQueue(EventTarget* owner)
: ContextLifecycleObserver(owner->GetExecutionContext()),
owner_(owner),
is_closed_(false) {
if (!GetExecutionContext())
DoClose(nullptr);
}
MediaElementEventQueue::~MediaElementEventQueue() = default;
......@@ -126,6 +128,7 @@ void MediaElementEventQueue::DoClose(ExecutionContext* context) {
}
void MediaElementEventQueue::DoCancelAllEvents(ExecutionContext* context) {
DCHECK(!pending_events_.size() || context);
for (auto& event : pending_events_) {
TRACE_EVENT_ASYNC_END2("event", "MediaElementEventQueue:enqueueEvent",
event, "type", event->type().Ascii(), "status",
......
......@@ -44,7 +44,7 @@ class CORE_EXPORT MediaElementEventQueue final
USING_GARBAGE_COLLECTED_MIXIN(MediaElementEventQueue);
public:
static MediaElementEventQueue* Create(EventTarget*, ExecutionContext*);
static MediaElementEventQueue* Create(EventTarget*);
~MediaElementEventQueue();
void Trace(blink::Visitor*) override;
......@@ -55,7 +55,7 @@ class CORE_EXPORT MediaElementEventQueue final
bool HasPendingEvents() const;
private:
MediaElementEventQueue(EventTarget*, ExecutionContext*);
explicit MediaElementEventQueue(EventTarget*);
bool RemoveEvent(Event* event);
void DispatchEvent(Event* event);
......
......@@ -463,7 +463,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tag_name,
this,
&HTMLMediaElement::CheckViewportIntersectionTimerFired),
played_time_ranges_(),
async_event_queue_(MediaElementEventQueue::Create(this, &document)),
async_event_queue_(MediaElementEventQueue::Create(this)),
playback_rate_(1.0f),
default_playback_rate_(1.0f),
network_state_(kNetworkEmpty),
......
......@@ -36,9 +36,7 @@
namespace blink {
TextTrackList::TextTrackList(HTMLMediaElement* owner)
: owner_(owner),
async_event_queue_(
MediaElementEventQueue::Create(this, &owner_->GetDocument())) {}
: owner_(owner), async_event_queue_(MediaElementEventQueue::Create(this)) {}
TextTrackList::~TextTrackList() = default;
......
......@@ -330,9 +330,7 @@ MediaKeySession::MediaKeySession(ScriptState* script_state,
MediaKeys* media_keys,
WebEncryptedMediaSessionType session_type)
: ContextLifecycleObserver(ExecutionContext::From(script_state)),
async_event_queue_(
MediaElementEventQueue::Create(this,
ExecutionContext::From(script_state))),
async_event_queue_(MediaElementEventQueue::Create(this)),
media_keys_(media_keys),
session_type_(session_type),
expiration_(std::numeric_limits<double>::quiet_NaN()),
......
......@@ -113,7 +113,7 @@ MediaSource* MediaSource::Create(ExecutionContext* context) {
MediaSource::MediaSource(ExecutionContext* context)
: ContextLifecycleObserver(context),
ready_state_(ClosedKeyword()),
async_event_queue_(MediaElementEventQueue::Create(this, context)),
async_event_queue_(MediaElementEventQueue::Create(this)),
attached_element_(nullptr),
source_buffers_(SourceBufferList::Create(GetExecutionContext(),
async_event_queue_.Get())),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment