Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 0 insertions, 153 deletions

diff --git a/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp b/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp
deleted file mode 100644
index 9faa4fd85..000000000
--- a/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2011 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "platform/WebMediaStreamDescriptor.h"
-
-#include "MediaStreamComponent.h"
-#include "MediaStreamDescriptor.h"
-#include "MediaStreamSource.h"
-#include "platform/WebMediaStreamComponent.h"
-#include "platform/WebMediaStreamSource.h"
-#include "platform/WebString.h"
-#include <wtf/Vector.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebMediaStreamDescriptor::WebMediaStreamDescriptor(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
-    : m_private(mediaStreamDescriptor)
-{
-}
-
-WebMediaStreamDescriptor::WebMediaStreamDescriptor(WebCore::MediaStreamDescriptor* mediaStreamDescriptor)
-    : m_private(mediaStreamDescriptor)
-{
-}
-
-void WebMediaStreamDescriptor::reset()
-{
-    m_private.reset();
-}
-
-WebString WebMediaStreamDescriptor::label() const
-{
-    return m_private->label();
-}
-
-// FIXME: Cleanup when the chromium code has switched to the split sources implementation.
-void WebMediaStreamDescriptor::sources(WebVector<WebMediaStreamSource>& webSources) const
-{
-    size_t numberOfAudioSources = m_private->numberOfAudioComponents();
-    size_t numberOfVideoSources = m_private->numberOfVideoComponents();
-    WebVector<WebMediaStreamSource> result(numberOfAudioSources + numberOfVideoSources);
-    size_t i = 0;
-    for (size_t j = 0; j < numberOfAudioSources; ++i, ++j)
-        result[i] = m_private->audioComponent(j)->source();
-    for (size_t j = 0; j < numberOfVideoSources; ++i, ++j)
-        result[i] = m_private->videoComponent(j)->source();
-    webSources.swap(result);
-}
-
-void WebMediaStreamDescriptor::audioSources(WebVector<WebMediaStreamComponent>& webSources) const
-{
-    size_t numberOfSources = m_private->numberOfAudioComponents();
-    WebVector<WebMediaStreamComponent> result(numberOfSources);
-    for (size_t i = 0; i < numberOfSources; ++i)
-        result[i] = m_private->audioComponent(i);
-    webSources.swap(result);
-}
-
-void WebMediaStreamDescriptor::videoSources(WebVector<WebMediaStreamComponent>& webSources) const
-{
-    size_t numberOfSources = m_private->numberOfVideoComponents();
-    WebVector<WebMediaStreamComponent> result(numberOfSources);
-    for (size_t i = 0; i < numberOfSources; ++i)
-        result[i] = m_private->videoComponent(i);
-    webSources.swap(result);
-}
-
-WebMediaStreamDescriptor& WebMediaStreamDescriptor::operator=(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
-{
-    m_private = mediaStreamDescriptor;
-    return *this;
-}
-
-WebMediaStreamDescriptor::operator PassRefPtr<WebCore::MediaStreamDescriptor>() const
-{
-    return m_private.get();
-}
-
-WebMediaStreamDescriptor::operator WebCore::MediaStreamDescriptor*() const
-{
-    return m_private.get();
-}
-
-// FIXME: Cleanup when the chromium code has switched to the split sources implementation.
-void WebMediaStreamDescriptor::initialize(const WebString& label, const WebVector<WebMediaStreamSource>& sources)
-{
-    MediaStreamSourceVector audio, video;
-    for (size_t i = 0; i < sources.size(); ++i) {
-        MediaStreamSource* curr = sources[i];
-        if (curr->type() == MediaStreamSource::TypeAudio)
-            audio.append(curr);
-        else if (curr->type() == MediaStreamSource::TypeVideo)
-            video.append(curr);
-    }
-    m_private = MediaStreamDescriptor::create(label, audio, video);
-}
-
-void WebMediaStreamDescriptor::initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources)
-{
-    MediaStreamSourceVector audio, video;
-    for (size_t i = 0; i < audioSources.size(); ++i) {
-        MediaStreamSource* curr = audioSources[i];
-        audio.append(curr);
-    }
-    for (size_t i = 0; i < videoSources.size(); ++i) {
-        MediaStreamSource* curr = videoSources[i];
-        video.append(curr);
-    }
-    m_private = MediaStreamDescriptor::create(label, audio, video);
-}
-
-void WebMediaStreamDescriptor::assign(const WebMediaStreamDescriptor& other)
-{
-    m_private = other.m_private;
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(MEDIA_STREAM)
-