Introduce WebMediaSession

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

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..4a07bd2ef8d7641c7596aff16b22ef2469a70f70 100644
--- a/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp
+++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp
@@ -5,19 +5,68 @@
 #include "config.h"
 #include "modules/mediasession/MediaSession.h"
 
+#include "bindings/core/v8/CallbackPromiseAdapter.h"
+#include "bindings/core/v8/ScriptState.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(ScriptState* scriptState)

[mlamouri (slow - plz ping), 2015/09/28 15:16:03]

The ExecutionContext should be enough. It will give you the Document from which
you should be able to get all you need.

[davve, 2015/10/06 12:05:13]

Done.

 {
-    return new MediaSession;
+    LocalDOMWindow* domWindow = scriptState->domWindow();
+    LocalFrame* frame = domWindow->frame();
+    FrameLoaderClient* client = frame->loader().client();
+    return new MediaSession(client->createWebMediaSession());
 }
 
-void MediaSession::activate()
+MediaSession* MediaSession::createForTesting(PassOwnPtr<WebMediaSession> webMediaSession)
 {
+    return new MediaSession(webMediaSession);
 }
 
-void MediaSession::deactivate()
+ScriptPromise MediaSession::activate(ScriptState* scriptState)
 {
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromise promise = resolver->promise();

[mlamouri (slow - plz ping), 2015/09/28 15:16:03]

Do you need to create the |promise| here? You could probably |return
resolver->promise();| at the end, couldn't you?

[davve, 2015/10/06 12:05:13]

Done.

+
+#if OS(ANDROID)

[mlamouri (slow - plz ping), 2015/09/28 15:16:03]

Could we avoid the ifdef and let that happen at a higher level? Or maybe fail if
m_webMediaSession is nullptr?

[davve, 2015/10/06 12:05:13]

Using m_webMediaSession != NULL wfm.

+    m_webMediaSession->activate(new CallbackPromiseAdapter<void, MediaSessionError>(resolver));
+#else
+    ScriptState::Scope scope(resolver->scriptState());
+    v8::Isolate* isolate = resolver->scriptState()->isolate();
+    resolver->reject(v8::Exception::Error(v8String(isolate, "Missing platform implementation.")));

[mlamouri (slow - plz ping), 2015/09/28 15:16:03]

Could you fail with a NotSupportedError?

[davve, 2015/10/06 12:05:13]

Done.

+#endif
+
+    return promise;
+}
+
+ScriptPromise MediaSession::deactivate(ScriptState* scriptState)
+{
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromise promise = resolver->promise();

[mlamouri (slow - plz ping), 2015/09/28 15:16:03]

ditto

[davve, 2015/10/06 12:05:13]

Done.

+
+#if OS(ANDROID)

[mlamouri (slow - plz ping), 2015/09/28 15:16:03]

ditto

[davve, 2015/10/06 12:05:13]

Done.

+    m_webMediaSession->deactivate(new CallbackPromiseAdapter<void, MediaSessionError>(resolver));
+#else
+    ScriptState::Scope scope(resolver->scriptState());
+    v8::Isolate* isolate = resolver->scriptState()->isolate();
+    resolver->reject(v8::Exception::Error(v8String(isolate, "Missing platform implementation.")));

[mlamouri (slow - plz ping), 2015/09/28 15:16:03]

ditto

[davve, 2015/10/06 12:05:13]

Done.

+#endif
+
+    return promise;
 }
 
 } // namespace blink