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..7a6e93345949b12c960714801b7e06bdeacf2a75 100644 |
--- a/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp |
+++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp |
@@ -5,19 +5,59 @@ |
#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) |
+{ |
+#if OS(ANDROID) |
+ ASSERT(m_webMediaSession); |
+#else |
+ ASSERT(!m_webMediaSession); |
+#endif // ANDROID |
+} |
+ |
+MediaSession* MediaSession::create(ExecutionContext* context) |
+{ |
+ Document* document = toDocument(context); |
+ LocalFrame* frame = document->frame(); |
+ FrameLoaderClient* client = frame->loader().client(); |
+ return new MediaSession(client->createWebMediaSession()); |
davve
2015/10/06 15:24:34
Philip suggested that we might throw an exception
|
+} |
+ |
+MediaSession* MediaSession::createForTesting(PassOwnPtr<WebMediaSession> webMediaSession) |
{ |
- return new MediaSession; |
+ return new MediaSession(webMediaSession); |
} |
-void MediaSession::activate() |
+ScriptPromise MediaSession::activate(ScriptState* scriptState) |
{ |
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
+ if (m_webMediaSession) |
+ m_webMediaSession->activate(new CallbackPromiseAdapter<void, MediaSessionError>(resolver)); |
+ else |
+ resolver->reject(DOMException::create(NotSupportedError, "Missing platform implementation.")); |
+ return resolver->promise(); |
davve
2015/10/06 16:05:11
Creating the promise this late doesn't work well w
|
} |
-void MediaSession::deactivate() |
+ScriptPromise MediaSession::deactivate(ScriptState* scriptState) |
{ |
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
+ if (m_webMediaSession) |
+ m_webMediaSession->deactivate(new CallbackPromiseAdapter<void, MediaSessionError>(resolver)); |
+ else |
+ resolver->reject(DOMException::create(NotSupportedError, "Missing platform implementation.")); |
+ return resolver->promise(); |
} |
} // namespace blink |