Chromium Code Reviews| Index: third_party/WebKit/Source/modules/mediasession/MediaSession.cpp |
| diff --git a/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp b/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp |
| index 937bf7f19d23f26aadf5c3f1ae0393ae0050d093..6bc907f1a967d5fbd98c8ee441f724f2f19afe66 100644 |
| --- a/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp |
| +++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp |
| @@ -5,19 +5,58 @@ |
| #include "config.h" |
| #include "modules/mediasession/MediaSession.h" |
| +#include "bindings/core/v8/CallbackPromiseAdapter.h" |
| +#include "bindings/core/v8/ScriptPromiseResolver.h" |
| +#include "bindings/core/v8/ScriptState.h" |
| +#include "core/dom/DOMException.h" |
| +#include "core/dom/ExceptionCode.h" |
| +#include "core/frame/LocalDOMWindow.h" |
| +#include "core/frame/LocalFrame.h" |
| +#include "core/loader/FrameLoaderClient.h" |
| +#include "modules/mediasession/MediaSessionError.h" |
| + |
| namespace blink { |
| -MediaSession* MediaSession::create() |
| +MediaSession::MediaSession(PassOwnPtr<WebMediaSession> webMediaSession) |
| + : m_webMediaSession(webMediaSession) |
| { |
| - return new MediaSession; |
| + ASSERT(m_webMediaSession); |
| } |
| -void MediaSession::activate() |
| +MediaSession* MediaSession::create(ExecutionContext* context, ExceptionState& exceptionState) |
| { |
| + Document* document = toDocument(context); |
| + LocalFrame* frame = document->frame(); |
| + FrameLoaderClient* client = frame->loader().client(); |
| + OwnPtr<WebMediaSession> webMediaSession = client->createWebMediaSession(); |
| + if (!webMediaSession) { |
| + exceptionState.throwDOMException(NotSupportedError, "Missing platform implementation."); |
| + return nullptr; |
|
mlamouri (slow - plz ping)
2015/10/09 13:01:28
I'm sceptical of that change. It means that if we
philipj_slow
2015/10/09 15:05:39
Neither this nor rejecting in activate() and deact
|
| + } |
| + return new MediaSession(webMediaSession.release()); |
| } |
| -void MediaSession::deactivate() |
| +MediaSession* MediaSession::createForTesting(PassOwnPtr<WebMediaSession> webMediaSession) |
| { |
| + return new MediaSession(webMediaSession); |
| +} |
| + |
| +ScriptPromise MediaSession::activate(ScriptState* scriptState) |
| +{ |
| + ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
| + ScriptPromise promise = resolver->promise(); |
| + |
| + m_webMediaSession->activate(new CallbackPromiseAdapter<void, MediaSessionError>(resolver)); |
| + return promise; |
| +} |
| + |
| +ScriptPromise MediaSession::deactivate(ScriptState* scriptState) |
| +{ |
| + ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
| + ScriptPromise promise = resolver->promise(); |
| + |
| + m_webMediaSession->deactivate(new CallbackPromiseAdapter<void, MediaSessionError>(resolver)); |
| + return promise; |
| } |
| } // namespace blink |