Remove RefPtr<ScriptState> from MediaSession

third_party/WebKit/Source/modules/mediasession/MediaSession.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/mediasession/MediaSession.h"
 
-#include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/Event.h"
 #include "core/frame/LocalFrame.h"
 #include "modules/EventTargetModules.h"
 #include "modules/mediasession/MediaMetadata.h"
 #include "modules/mediasession/MediaMetadataSanitizer.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/InterfaceProvider.h"
@@ skipping 44 matching lines @@
     return MediaSessionAction::SEEK_BACKWARD;
   if (EventTypeNames::seekforward == eventName)
     return MediaSessionAction::SEEK_FORWARD;
 
   NOTREACHED();
   return WTF::nullopt;
 }
 
 }  // anonymous namespace
 
-MediaSession::MediaSession(ScriptState* scriptState)
-    : m_scriptState(scriptState), m_clientBinding(this) {}
+MediaSession::MediaSession(ExecutionContext* executionContext)
+    : ContextLifecycleObserver(executionContext), m_clientBinding(this) {}
 
-MediaSession* MediaSession::create(ScriptState* scriptState) {
-  return new MediaSession(scriptState);
+MediaSession* MediaSession::create(ExecutionContext* executionContext) {
+  return new MediaSession(executionContext);
 }
 
 void MediaSession::dispose() {
   m_clientBinding.Close();
 }
 
 void MediaSession::setMetadata(MediaMetadata* metadata) {
-  if (mojom::blink::MediaSessionService* service =
-          getService(m_scriptState.get())) {
+  if (mojom::blink::MediaSessionService* service = getService()) {
     service->SetMetadata(MediaMetadataSanitizer::sanitizeAndConvertToMojo(
         metadata, getExecutionContext()));
   }
 }
 
 MediaMetadata* MediaSession::metadata() const {
   return m_metadata;
 }
 
 const WTF::AtomicString& MediaSession::interfaceName() const {
   return EventTargetNames::MediaSession;
 }
 
 ExecutionContext* MediaSession::getExecutionContext() const {
-  return m_scriptState->getExecutionContext();
+  return ContextLifecycleObserver::getExecutionContext();
 }
 
-mojom::blink::MediaSessionService* MediaSession::getService(
-    ScriptState* scriptState) {
+mojom::blink::MediaSessionService* MediaSession::getService() {
   if (m_service)
     return m_service.get();
+  if (!getExecutionContext())
+    return nullptr;
 
-  DCHECK(scriptState->getExecutionContext()->isDocument())
+  DCHECK(getExecutionContext()->isDocument())
       << "MediaSession::getService() is only available from a frame";
-  Document* document = toDocument(scriptState->getExecutionContext());
+  Document* document = toDocument(getExecutionContext());
   if (!document->frame())
     return nullptr;
 
   InterfaceProvider* interfaceProvider = document->frame()->interfaceProvider();
   if (!interfaceProvider)
     return nullptr;
 
   interfaceProvider->getInterface(mojo::GetProxy(&m_service));
   if (m_service.get())
     m_service->SetClient(m_clientBinding.CreateInterfacePtrAndBind());
 
   return m_service.get();
 }
 
 bool MediaSession::addEventListenerInternal(
     const AtomicString& eventType,
     EventListener* listener,
     const AddEventListenerOptionsResolved& options) {
-  if (mojom::blink::MediaSessionService* service =
-          getService(m_scriptState.get())) {
+  if (mojom::blink::MediaSessionService* service = getService()) {
     auto mojomAction = eventNameToMojomAction(eventType);
     DCHECK(mojomAction.has_value());
     service->EnableAction(mojomAction.value());
   }
   return EventTarget::addEventListenerInternal(eventType, listener, options);
 }
 
 bool MediaSession::removeEventListenerInternal(
     const AtomicString& eventType,
     const EventListener* listener,
     const EventListenerOptions& options) {
-  if (mojom::blink::MediaSessionService* service =
-          getService(m_scriptState.get())) {
+  if (mojom::blink::MediaSessionService* service = getService()) {
     auto mojomAction = eventNameToMojomAction(eventType);
     DCHECK(mojomAction.has_value());
     service->DisableAction(mojomAction.value());
   }
   return EventTarget::removeEventListenerInternal(eventType, listener, options);
 }
 
 void MediaSession::DidReceiveAction(
     blink::mojom::blink::MediaSessionAction action) {
   DCHECK(getExecutionContext()->isDocument());
   Document* document = toDocument(getExecutionContext());
   UserGestureIndicator gestureIndicator(
       DocumentUserGestureToken::create(document));
   dispatchEvent(Event::create(mojomActionToEventName(action)));
 }
 
 DEFINE_TRACE(MediaSession) {
   visitor->trace(m_metadata);
   EventTargetWithInlineData::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink