[MediaStream API] Adding MediaStreamTrack::getSourceInfos

Source/core/platform/chromium/support/WebSourceInfo.cpp

 /*
  * Copyright (C) 2013 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL GOOGLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 "MockWebRTCDTMFSenderHandler.h"
+#include <public/WebSourceInfo.h>
 
-#include "WebTestDelegate.h"
-#include <assert.h>
-#include <public/WebMediaStreamSource.h>
-#include <public/WebRTCDTMFSenderHandlerClient.h>
+#include "wtf/PassRefPtr.h"
+#include "wtf/RefCounted.h"
+#include <public/WebString.h>
 
-using namespace WebKit;
+namespace WebKit {
 
-namespace WebTestRunner {
+class WebSourceInfoPrivate : public RefCounted<WebSourceInfoPrivate> {
+public:
+    static PassRefPtr<WebSourceInfoPrivate> create(const WebString& id, WebSourceInfo::SourceKind, const WebString& label, WebSourceInfo::VideoFacingMode);
+    virtual ~WebSourceInfoPrivate();
 
-class DTMFSenderToneTask : public WebMethodTask<MockWebRTCDTMFSenderHandler> {
-public:
-    DTMFSenderToneTask(MockWebRTCDTMFSenderHandler* object, WebRTCDTMFSenderHandlerClient* client)
-        : WebMethodTask<MockWebRTCDTMFSenderHandler>(object)
-        , m_client(client)
-    {
-    }
-
-    virtual void runIfValid() OVERRIDE
-    {
-        WebString tones = m_object->currentToneBuffer();
-        m_object->clearToneBuffer();
-        m_client->didPlayTone(tones);
-    }
+    WebString id() const { return m_id; }

[abarth-chromium, 2013/05/31 17:30:08]

These can return const WebString& 

[Tommy Widenflycht, 2013/06/05 11:51:38]

Done.

+    WebSourceInfo::SourceKind kind() const { return m_kind; }
+    WebString label() const { return m_label; }
+    WebSourceInfo::VideoFacingMode facing() const { return m_facing; }
 
 private:
-    WebRTCDTMFSenderHandlerClient* m_client;
+    WebSourceInfoPrivate(const WebString& id, WebSourceInfo::SourceKind, const WebString& label, WebSourceInfo::VideoFacingMode);
+
+    WebString m_id;
+    WebSourceInfo::SourceKind m_kind;
+    WebString m_label;
+    WebSourceInfo::VideoFacingMode m_facing;
 };
 
-/////////////////////
+PassRefPtr<WebSourceInfoPrivate> WebSourceInfoPrivate::create(const WebString& id, WebSourceInfo::SourceKind kind, const WebString& label, WebSourceInfo::VideoFacingMode facing)
+{
+    return adoptRef(new WebSourceInfoPrivate(id, kind, label, facing));
+}
 
-MockWebRTCDTMFSenderHandler::MockWebRTCDTMFSenderHandler(const WebMediaStreamTrack& track, WebTestDelegate* delegate)
-    : m_client(0)
-    , m_track(track)
-    , m_delegate(delegate)
+WebSourceInfoPrivate::WebSourceInfoPrivate(const WebString& id, WebSourceInfo::SourceKind kind, const WebString& label, WebSourceInfo::VideoFacingMode facing)
+    : m_id(id)
+    , m_kind(kind)
+    , m_label(label)
+    , m_facing(facing)
 {
 }
 
-void MockWebRTCDTMFSenderHandler::setClient(WebRTCDTMFSenderHandlerClient* client)
+WebSourceInfoPrivate::~WebSourceInfoPrivate()
 {
-    m_client = client;
 }
 
-WebString MockWebRTCDTMFSenderHandler::currentToneBuffer()
+void WebSourceInfo::assign(const WebSourceInfo& other)
 {
-    return m_toneBuffer;
+    m_private = other.m_private;
 }
 
-bool MockWebRTCDTMFSenderHandler::canInsertDTMF()
+void WebSourceInfo::reset()
 {
-    assert(m_client && !m_track.isNull());
-    return m_track.source().type() == WebMediaStreamSource::TypeAudio && m_track.isEnabled() && m_track.source().readyState() == WebMediaStreamSource::ReadyStateLive;
+    m_private.reset();
 }
 
-bool MockWebRTCDTMFSenderHandler::insertDTMF(const WebString& tones, long duration, long interToneGap)
+void WebSourceInfo::initialize(const WebString& id, WebSourceInfo::SourceKind kind, const WebString& label, WebSourceInfo::VideoFacingMode facing)
 {
-    assert(m_client);
-    if (!canInsertDTMF())
-        return false;
-
-    m_toneBuffer = tones;
-    m_delegate->postTask(new DTMFSenderToneTask(this, m_client));
-    m_delegate->postTask(new DTMFSenderToneTask(this, m_client));
-    return true;
+    m_private = WebSourceInfoPrivate::create(id, kind, label, facing);
 }
 
+WebString WebSourceInfo::id() const
+{
+    ASSERT(!m_private.isNull());
+    return m_private->id();
 }
+
+WebSourceInfo::SourceKind WebSourceInfo::kind() const
+{
+    ASSERT(!m_private.isNull());
+    return m_private->kind();
+}
+
+WebString WebSourceInfo::label() const
+{
+    ASSERT(!m_private.isNull());
+    return m_private->label();
+}
+
+WebSourceInfo::VideoFacingMode WebSourceInfo::facing() const
+{
+    ASSERT(!m_private.isNull());
+    return m_private->facing();
+}
+
+} // namespace WebKit
+