MediaStream API: Changing the device enumeration to be async

Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.h

Index: Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.h
diff --git a/Source/modules/mediastream/RTCDTMFToneChangeEvent.h b/Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.h
similarity index 59%
copy from Source/modules/mediastream/RTCDTMFToneChangeEvent.h
copy to Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.h
index e9e3543446336a8d50ea5c29a04a30fccba217b9..2e3b5f7853d5be39c62662a9066490e774280226 100644
--- a/Source/modules/mediastream/RTCDTMFToneChangeEvent.h
+++ b/Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.h
@@ -23,38 +23,39 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RTCDTMFToneChangeEvent_h
-#define RTCDTMFToneChangeEvent_h
+#ifndef MediaStreamTrackSourcesRequestImpl_h
+#define MediaStreamTrackSourcesRequestImpl_h
 
-#include "core/dom/Event.h"
-#include "wtf/text/AtomicString.h"
+#include "core/dom/ActiveDOMObject.h"
+#include "core/platform/mediastream/MediaStreamTrackSourcesRequest.h"
 
 namespace WebCore {
 
-struct RTCDTMFToneChangeEventInit : public EventInit {
-    String tone;
-};
+class MediaStreamTrackSourcesCallback;
 
-class RTCDTMFToneChangeEvent : public Event {
+class MediaStreamTrackSourcesRequestImpl : public MediaStreamTrackSourcesRequest, public ActiveDOMObject {

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

Why does this need to be an active DOM object?  The
MediaStreamTrackSourcesCallback object should already be notified when the
context shuts down...

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

Double safety belts... Fixed.

 public:
-    virtual ~RTCDTMFToneChangeEvent();
+    static PassRefPtr<MediaStreamTrackSourcesRequestImpl> create(ScriptExecutionContext*, PassRefPtr<MediaStreamTrackSourcesCallback>);
+    virtual ~MediaStreamTrackSourcesRequestImpl();
 
-    static PassRefPtr<RTCDTMFToneChangeEvent> create();
-    static PassRefPtr<RTCDTMFToneChangeEvent> create(const String& tone);
-    static PassRefPtr<RTCDTMFToneChangeEvent> create(const AtomicString& type, const RTCDTMFToneChangeEventInit& initializer);
+    virtual String url() { return m_url; }
 
-    const String& tone() const;
+    virtual void requestSucceeded(const WebKit::WebVector<WebKit::WebSourceInfo>&) OVERRIDE;
 
-    virtual const AtomicString& interfaceName() const;
+    // ActiveDOMObject
+    virtual void stop() OVERRIDE;
 
 private:
-    RTCDTMFToneChangeEvent();
-    explicit RTCDTMFToneChangeEvent(const String& tone);
-    explicit RTCDTMFToneChangeEvent(const RTCDTMFToneChangeEventInit&);
+    MediaStreamTrackSourcesRequestImpl(ScriptExecutionContext*, PassRefPtr<MediaStreamTrackSourcesCallback>);
+
+    void clear();
 
-    String m_tone;
+    String m_url;
+    RefPtr<MediaStreamTrackSourcesCallback> m_callback;
 };
 
 } // namespace WebCore
 
-#endif // RTCDTMFToneChangeEvent_h
+#endif // MediaStreamTrackSourcesRequestImpl_h
+
+