| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/mediasession/NavigatorMediaSession.h" | 5 #include "modules/mediasession/NavigatorMediaSession.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ExceptionStatePlaceholder.h" | 7 #include "bindings/core/v8/ExceptionStatePlaceholder.h" |
| 8 #include "modules/mediasession/MediaSession.h" | 8 #include "modules/mediasession/MediaSession.h" |
| 9 #include "platform/Supplementable.h" | 9 #include "platform/Supplementable.h" |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 NavigatorMediaSession& NavigatorMediaSession::from(Navigator& navigator) { | 24 NavigatorMediaSession& NavigatorMediaSession::from(Navigator& navigator) { |
| 25 NavigatorMediaSession* supplement = static_cast<NavigatorMediaSession*>( | 25 NavigatorMediaSession* supplement = static_cast<NavigatorMediaSession*>( |
| 26 Supplement<Navigator>::from(navigator, supplementName())); | 26 Supplement<Navigator>::from(navigator, supplementName())); |
| 27 if (!supplement) { | 27 if (!supplement) { |
| 28 supplement = new NavigatorMediaSession(navigator); | 28 supplement = new NavigatorMediaSession(navigator); |
| 29 provideTo(navigator, supplementName(), supplement); | 29 provideTo(navigator, supplementName(), supplement); |
| 30 } | 30 } |
| 31 return *supplement; | 31 return *supplement; |
| 32 } | 32 } |
| 33 | 33 |
| 34 MediaSession* NavigatorMediaSession::mediaSession(Navigator& navigator) { | 34 MediaSession* NavigatorMediaSession::mediaSession(ScriptState* scriptState, |
| 35 Navigator& navigator) { |
| 35 NavigatorMediaSession& self = NavigatorMediaSession::from(navigator); | 36 NavigatorMediaSession& self = NavigatorMediaSession::from(navigator); |
| 36 if (!self.m_session) | 37 if (!self.m_session) |
| 37 self.m_session = MediaSession::create(); | 38 self.m_session = MediaSession::create(scriptState); |
| 38 return self.m_session.get(); | 39 return self.m_session.get(); |
| 39 } | 40 } |
| 40 | 41 |
| 41 } // namespace blink | 42 } // namespace blink |
| OLD | NEW |