MediaStream API: Changing the device enumeration to be async

Source/modules/mediastream/MediaStreamTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/mediastream/MediaStreamTrack.h"
 
 #include "core/dom/Event.h"
 #include "core/dom/ScriptExecutionContext.h"
 #include "core/platform/mediastream/MediaStreamCenter.h"
 #include "core/platform/mediastream/MediaStreamComponent.h"
+#include "modules/mediastream/MediaStreamTrackSourcesCallback.h"
+#include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h"
 #include "public/platform/WebSourceInfo.h"
-#include "weborigin/SecurityOrigin.h"
 
 namespace WebCore {
 
 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* context, MediaStreamComponent* component)
 {
     RefPtr<MediaStreamTrack> track = adoptRef(new MediaStreamTrack(context, component));
     track->suspendIfNeeded();
     return track.release();
 }
 
@@ skipping 66 matching lines @@
     case MediaStreamSource::ReadyStateMuted:
         return ASCIILiteral("muted");
     case MediaStreamSource::ReadyStateEnded:
         return ASCIILiteral("ended");
     }
 
     ASSERT_NOT_REACHED();
     return String();
 }
 
-SourceInfoVector MediaStreamTrack::getSourceInfos(ScriptExecutionContext* context, ExceptionCode& ec)
+void MediaStreamTrack::getSources(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callback, ExceptionCode& ec)
 {
-    WebKit::WebVector<WebKit::WebSourceInfo> webSourceInfos;
-    bool ok = MediaStreamCenter::instance().getSourceInfos(context->securityOrigin()->toString(), webSourceInfos);
-    if (!ok) {
+    RefPtr<MediaStreamTrackSourcesRequest> request = MediaStreamTrackSourcesRequestImpl::create(context, callback);

[abarth-chromium, 2013/06/11 23:50:44]

MediaStreamTrackSourcesRequestImpl <-- We can probably merge
MediaStreamTrackSourcesRequest and MediaStreamTrackSourcesRequestImpl into one
class.

[Tommy Widenflycht, 2013/06/12 12:29:34]

Done.

+    bool ok = MediaStreamCenter::instance().getMediaStreamTrackSources(request.release());
+    if (!ok)
         ec = NOT_SUPPORTED_ERR;
-        return SourceInfoVector();
-    }
-
-    SourceInfoVector sourceInfos;
-    for (size_t i = 0; i < webSourceInfos.size(); ++i)
-        sourceInfos.append(SourceInfo::create(webSourceInfos[i]));
-
-    return sourceInfos;
 }
 
 bool MediaStreamTrack::ended() const
 {
     return m_stopped || (m_component->source()->readyState() == MediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamTrack::sourceChangedState()
 {
     if (m_stopped)
@@ skipping 46 matching lines @@
 {
     return &m_eventTargetData;
 }
 
 EventTargetData* MediaStreamTrack::ensureEventTargetData()
 {
     return &m_eventTargetData;
 }
 
 } // namespace WebCore