MediaStream API: Changing the device enumeration to be async

Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "core/platform/mediastream/chromium/MediaStreamCenterChromium.h"
 
 #include "core/platform/mediastream/MediaStreamDescriptor.h"
 #include "core/platform/mediastream/MediaStreamSourcesQueryClient.h"
+#include "modules/mediastream/MediaStreamTrackSourcesRequest.h"

[jamesr, 2013/06/12 17:39:40]

this is also unfortunate

 #include "public/platform/Platform.h"
 #include "public/platform/WebMediaStream.h"
 #include "public/platform/WebMediaStreamCenter.h"
 #include "public/platform/WebMediaStreamSourcesRequest.h"
 #include "public/platform/WebMediaStreamTrack.h"
+#include "public/platform/WebMediaStreamTrackSourcesRequest.h"
 #include "wtf/MainThread.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
 MediaStreamCenter& MediaStreamCenter::instance()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(MediaStreamCenterChromium, center, ());
     return center;
@@ skipping 11 matching lines @@
 void MediaStreamCenterChromium::queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient> client)
 {
     if (m_private)
         m_private->queryMediaStreamSources(client);
     else {
         MediaStreamSourceVector audioSources, videoSources;
         client->didCompleteQuery(audioSources, videoSources);
     }
 }
 
-bool MediaStreamCenterChromium::getSourceInfos(const String& url, WebKit::WebVector<WebKit::WebSourceInfo>& sourceInfos)
+bool MediaStreamCenterChromium::getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequest> request)
 {
-    return m_private && m_private->getSourceInfos(url, sourceInfos);
+    return m_private && m_private->getMediaStreamTrackSources(request);
 }
 
 void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(MediaStreamDescriptor* stream,  MediaStreamComponent* component)
 {
     if (m_private) {
         if (component->enabled())
             m_private->didEnableMediaStreamTrack(stream, component);
         else
             m_private->didDisableMediaStreamTrack(stream, component);
     }
@@ skipping 27 matching lines @@
         m_private->didCreateMediaStream(webStream);
     }
 }
 
 void MediaStreamCenterChromium::stopLocalMediaStream(const WebKit::WebMediaStream& stream)
 {
     endLocalMediaStream(stream);
 }
 
 } // namespace WebCore