From ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 8 Aug 2014 14:30:41 +0200 Subject: Update Chromium to beta version 37.0.2062.68 Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi --- .../platform/mediastream/MediaStreamDescriptor.h | 105 --------------------- 1 file changed, 105 deletions(-) delete mode 100644 chromium/third_party/WebKit/Source/core/platform/mediastream/MediaStreamDescriptor.h (limited to 'chromium/third_party/WebKit/Source/core/platform/mediastream/MediaStreamDescriptor.h') diff --git a/chromium/third_party/WebKit/Source/core/platform/mediastream/MediaStreamDescriptor.h b/chromium/third_party/WebKit/Source/core/platform/mediastream/MediaStreamDescriptor.h deleted file mode 100644 index 383602b1f18..00000000000 --- a/chromium/third_party/WebKit/Source/core/platform/mediastream/MediaStreamDescriptor.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2011 Ericsson AB. All rights reserved. - * 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: - * - * 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. - * 3. Neither the name of Ericsson 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. - */ - -#ifndef MediaStreamDescriptor_h -#define MediaStreamDescriptor_h - -#include "platform/mediastream/MediaStreamComponent.h" -#include "platform/mediastream/MediaStreamSource.h" -#include "wtf/RefCounted.h" -#include "wtf/Vector.h" - -namespace WebCore { - -class MediaStreamDescriptorClient { -public: - virtual ~MediaStreamDescriptorClient() { } - - virtual void trackEnded() = 0; - virtual void streamEnded() = 0; - virtual void addRemoteTrack(MediaStreamComponent*) = 0; - virtual void removeRemoteTrack(MediaStreamComponent*) = 0; -}; - -class MediaStreamDescriptor FINAL : public RefCounted { -public: - class ExtraData : public RefCounted { - public: - virtual ~ExtraData() { } - }; - - static PassRefPtr create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources); - - static PassRefPtr create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents); - - ~MediaStreamDescriptor(); - - MediaStreamDescriptorClient* client() const { return m_client; } - void setClient(MediaStreamDescriptorClient* client) { m_client = client; } - - String id() const { return m_id; } - - unsigned numberOfAudioComponents() const { return m_audioComponents.size(); } - MediaStreamComponent* audioComponent(unsigned index) const { return m_audioComponents[index].get(); } - - unsigned numberOfVideoComponents() const { return m_videoComponents.size(); } - MediaStreamComponent* videoComponent(unsigned index) const { return m_videoComponents[index].get(); } - - void addComponent(PassRefPtr); - void removeComponent(PassRefPtr); - - void addRemoteTrack(MediaStreamComponent*); - void removeRemoteTrack(MediaStreamComponent*); - - bool ended() const { return m_ended; } - void setEnded() { m_ended = true; } - - PassRefPtr extraData() const { return m_extraData; } - void setExtraData(PassRefPtr extraData) { m_extraData = extraData; } - -private: - MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources); - MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents); - - MediaStreamDescriptorClient* m_client; - String m_id; - Vector > m_audioComponents; - Vector > m_videoComponents; - bool m_ended; - - RefPtr m_extraData; -}; - -typedef Vector > MediaStreamDescriptorVector; - -} // namespace WebCore - -#endif // MediaStreamDescriptor_h -- cgit v1.2.3