| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 #ifndef MediaStreamDescriptor_h | 32 #ifndef MediaStreamDescriptor_h |
| 33 #define MediaStreamDescriptor_h | 33 #define MediaStreamDescriptor_h |
| 34 | 34 |
| 35 #include <memory> |
| 35 #include "platform/mediastream/MediaStreamComponent.h" | 36 #include "platform/mediastream/MediaStreamComponent.h" |
| 36 #include "platform/mediastream/MediaStreamSource.h" | 37 #include "platform/mediastream/MediaStreamSource.h" |
| 37 #include "wtf/Allocator.h" | 38 #include "wtf/Allocator.h" |
| 38 #include "wtf/Forward.h" | 39 #include "wtf/Forward.h" |
| 39 #include "wtf/Vector.h" | 40 #include "wtf/Vector.h" |
| 40 #include <memory> | |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 class PLATFORM_EXPORT MediaStreamDescriptorClient | 44 class PLATFORM_EXPORT MediaStreamDescriptorClient |
| 45 : public GarbageCollectedMixin { | 45 : public GarbageCollectedMixin { |
| 46 public: | 46 public: |
| 47 virtual ~MediaStreamDescriptorClient() {} | 47 virtual ~MediaStreamDescriptorClient() {} |
| 48 | 48 |
| 49 virtual void streamEnded() = 0; | 49 virtual void streamEnded() = 0; |
| 50 virtual void addRemoteTrack(MediaStreamComponent*) = 0; | 50 virtual void addRemoteTrack(MediaStreamComponent*) = 0; |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 bool m_active; | 126 bool m_active; |
| 127 | 127 |
| 128 std::unique_ptr<ExtraData> m_extraData; | 128 std::unique_ptr<ExtraData> m_extraData; |
| 129 }; | 129 }; |
| 130 | 130 |
| 131 typedef HeapVector<Member<MediaStreamDescriptor>> MediaStreamDescriptorVector; | 131 typedef HeapVector<Member<MediaStreamDescriptor>> MediaStreamDescriptorVector; |
| 132 | 132 |
| 133 } // namespace blink | 133 } // namespace blink |
| 134 | 134 |
| 135 #endif // MediaStreamDescriptor_h | 135 #endif // MediaStreamDescriptor_h |
| OLD | NEW |