Implement setSinkId() for media elements without src.

third_party/WebKit/Source/modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/ExecutionContext.h"
+#include "modules/audio_output_devices/AudioOutputDeviceClient.h"
 #include "modules/audio_output_devices/SetSinkIdCallbacks.h"
 #include "public/platform/WebSecurityOrigin.h"
 
 namespace blink {
 
 HTMLMediaElementAudioOutputDevice::HTMLMediaElementAudioOutputDevice()
     : m_sinkId("")
 {
 }
 
 String HTMLMediaElementAudioOutputDevice::sinkId(HTMLMediaElement& element)
 {
     HTMLMediaElementAudioOutputDevice& aodElement = HTMLMediaElementAudioOutputDevice::from(element);
     return aodElement.m_sinkId;
 }
 
 void HTMLMediaElementAudioOutputDevice::setSinkId(const String& sinkId)
 {
     m_sinkId = sinkId;
 }
 
 ScriptPromise HTMLMediaElementAudioOutputDevice::setSinkId(ScriptState* scriptState, HTMLMediaElement& element, const String& sinkId)
 {
     ASSERT(scriptState);

[Peter Beverloo, 2015/11/09 20:05:06]

note: We seem to be missing step 1 of the algorithm here.

1. If sinkId and the sinkId attribute are the same object, return a
   resolved promise. (http://www.w3.org/TR/audio-output/#methods)

|sinkId| is defined to be the empty string as the default value, so most of the
cases in the layout test (lines 24, 30, 50, 52, 63 and 66) would actually hit
this step.

[Guido Urdaneta, 2015/11/10 15:36:51]

Done.

 
     WebMediaPlayer* webMediaPlayer = element.webMediaPlayer();
-    if (!webMediaPlayer)
-        return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(AbortError, "No media player available"));
-
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
+    OwnPtr<SetSinkIdCallbacks> callbacks = adoptPtr(new SetSinkIdCallbacks(resolver, element, sinkId));
     ExecutionContext* context = scriptState->executionContext();
     ASSERT(context && context->isDocument());
 
-    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
-    webMediaPlayer->setSinkId(sinkId, WebSecurityOrigin(context->securityOrigin()), new SetSinkIdCallbacks(resolver, element, sinkId));
+    if (webMediaPlayer) {
+        // Using leakPtr() to transfer ownership because |webMediaPlayer| is a platform object that takes raw pointers
+        webMediaPlayer->setSinkId(sinkId, WebSecurityOrigin(context->securityOrigin()), callbacks.leakPtr());
+    } else {
+        if (AudioOutputDeviceClient* client = AudioOutputDeviceClient::from(context)) {
+            client->checkIfAudioSinkExistsAndIsAuthorized(context, sinkId, callbacks.release());
+        } else {
+            // The context has been detached. Impossible to get a security origin to check.
+            ASSERT(context->activeDOMObjectsAreStopped());
+            resolver->reject();

[Peter Beverloo, 2015/11/09 20:05:06]

nit: why not reject the resolver with the dom error? Then you can just
fall-through to the return on line 57.

resolver->reject(DOMException::create(SecurityError, "Impossible to authorize
device for detached context"));

[Guido Urdaneta, 2015/11/10 15:36:51]

Done. Note that the implementation is slightly different now as it is
asynchronous in Blink.

+            return ScriptPromise::rejectWithDOMException(scriptState,  DOMException::create(SecurityError, "Impossible to authorize device for detached context"));
+        }
+    }
+
     return resolver->promise();
 }
 
 const char* HTMLMediaElementAudioOutputDevice::supplementName()
 {
     return "HTMLMediaElementAudioOutputDevice";
 }
 
 HTMLMediaElementAudioOutputDevice& HTMLMediaElementAudioOutputDevice::from(HTMLMediaElement& element)
 {
     HTMLMediaElementAudioOutputDevice* supplement = static_cast<HTMLMediaElementAudioOutputDevice*>(WillBeHeapSupplement<HTMLMediaElement>::from(element, supplementName()));
     if (!supplement) {
         supplement = new HTMLMediaElementAudioOutputDevice();
         provideTo(element, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
 
 DEFINE_TRACE(HTMLMediaElementAudioOutputDevice)
 {
     WillBeHeapSupplement<HTMLMediaElement>::trace(visitor);
 }
 
 } // namespace blink