Implementation of setSinkId() for HTMLMediaElement.

Source/modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.cpp

Index: Source/modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.cpp
diff --git a/Source/modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.cpp b/Source/modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.cpp
index 5e7fd020a86f6056034fe76be2c43acdd12b5c62..fbfe6510495216865ece7887e25474bfa2d56fbd 100644
--- a/Source/modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.cpp
+++ b/Source/modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.cpp
@@ -8,6 +8,7 @@
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/ExecutionContext.h"
+#include "modules/audio_output_devices/SetSinkIdCallbacks.h"
 #include "platform/Logging.h"
 
 namespace blink {
@@ -24,10 +25,26 @@ String HTMLMediaElementAudioOutputDevice::sinkId(HTMLMediaElement& element)
     return aodElement.m_sinkId;
 }
 
-ScriptPromise HTMLMediaElementAudioOutputDevice::setSinkId(ScriptState* scriptState, HTMLMediaElement& element, const String& newSinkId)
+void HTMLMediaElementAudioOutputDevice::setSinkId(const String& sinkId)
+{
+    m_sinkId = sinkId;
+}
+
+ScriptPromise HTMLMediaElementAudioOutputDevice::setSinkId(ScriptState* scriptState, HTMLMediaElement& element, const String& sinkId)
 {
     WTF_LOG(Media, __FUNCTION__);
-    return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError, "Operation not supported"));
+    WebMediaPlayer* webMediaPlayer = element.webMediaPlayer();
+    if (!webMediaPlayer)
+        return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(AbortError, "No media player available"));

[Peter Beverloo, 2015/06/18 14:33:15]

As in the other CL - should this be an ASSERT()?

[Guido Urdaneta, 2015/06/18 23:09:05]

In this case the check is valid.
For empty media elements (e.g.g <video id="empty"></video>, webMediaPlayer is
actually null, and in that case there is no actual audio sink to be set.

The spec needs some updates because it says that in these cases a rejected
promise should be returned, but it does not specify with what kind of exception.


I asked hta, who is involved in spec writing, and he told me that, until the
specification is clearer, AbortError is a good error to use.

+
+    RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+    HTMLMediaElementAudioOutputDevice& aodElement = HTMLMediaElementAudioOutputDevice::from(element);
+    if (sinkId == aodElement.m_sinkId)
+        resolver->resolve();
+    else
+        webMediaPlayer->setSinkId(sinkId, new SetSinkIdCallbacks(resolver, element, sinkId));
+
+    return resolver->promise();
 }
 
 const char* HTMLMediaElementAudioOutputDevice::supplementName()