| 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 17 matching lines...) Expand all Loading... |
| 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 "platform/mediastream/MediaStreamComponent.h" | 35 #include "platform/mediastream/MediaStreamComponent.h" |
| 36 #include "platform/mediastream/MediaStreamSource.h" | 36 #include "platform/mediastream/MediaStreamSource.h" |
| 37 #include "wtf/Allocator.h" | 37 #include "wtf/Allocator.h" |
| 38 #include "wtf/PassOwnPtr.h" | 38 #include "wtf/Forward.h" |
| 39 #include "wtf/RefCounted.h" | |
| 40 #include "wtf/Vector.h" | 39 #include "wtf/Vector.h" |
| 41 | 40 |
| 42 namespace blink { | 41 namespace blink { |
| 43 | 42 |
| 44 class PLATFORM_EXPORT MediaStreamDescriptorClient : public GarbageCollectedMixin
{ | 43 class PLATFORM_EXPORT MediaStreamDescriptorClient : public GarbageCollectedMixin
{ |
| 45 public: | 44 public: |
| 46 virtual ~MediaStreamDescriptorClient() { } | 45 virtual ~MediaStreamDescriptorClient() { } |
| 47 | 46 |
| 48 virtual void streamEnded() = 0; | 47 virtual void streamEnded() = 0; |
| 49 virtual void addRemoteTrack(MediaStreamComponent*) = 0; | 48 virtual void addRemoteTrack(MediaStreamComponent*) = 0; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 bool m_ended; | 108 bool m_ended; |
| 110 | 109 |
| 111 OwnPtr<ExtraData> m_extraData; | 110 OwnPtr<ExtraData> m_extraData; |
| 112 }; | 111 }; |
| 113 | 112 |
| 114 typedef HeapVector<Member<MediaStreamDescriptor>> MediaStreamDescriptorVector; | 113 typedef HeapVector<Member<MediaStreamDescriptor>> MediaStreamDescriptorVector; |
| 115 | 114 |
| 116 } // namespace blink | 115 } // namespace blink |
| 117 | 116 |
| 118 #endif // MediaStreamDescriptor_h | 117 #endif // MediaStreamDescriptor_h |
| OLD | NEW |