| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef MediaStreamComponent_h | 31 #ifndef MediaStreamComponent_h |
| 32 #define MediaStreamComponent_h | 32 #define MediaStreamComponent_h |
| 33 | 33 |
| 34 #if ENABLE(MEDIA_STREAM) | 34 #if ENABLE(MEDIA_STREAM) |
| 35 | 35 |
| 36 #include "MediaStreamSource.h" | |
| 37 #include "UUID.h" | 36 #include "UUID.h" |
| 37 #include "core/platform/mediastream/MediaStreamSource.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 class MediaStreamDescriptor; | 41 class MediaStreamDescriptor; |
| 42 | 42 |
| 43 class MediaStreamComponent : public RefCounted<MediaStreamComponent> { | 43 class MediaStreamComponent : public RefCounted<MediaStreamComponent> { |
| 44 public: | 44 public: |
| 45 static PassRefPtr<MediaStreamComponent> create(PassRefPtr<MediaStreamSource>
source) | 45 static PassRefPtr<MediaStreamComponent> create(PassRefPtr<MediaStreamSource>
source) |
| 46 { | 46 { |
| 47 return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), 0,
source)); | 47 return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), 0,
source)); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 bool m_enabled; | 82 bool m_enabled; |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 typedef Vector<RefPtr<MediaStreamComponent> > MediaStreamComponentVector; | 85 typedef Vector<RefPtr<MediaStreamComponent> > MediaStreamComponentVector; |
| 86 | 86 |
| 87 } // namespace WebCore | 87 } // namespace WebCore |
| 88 | 88 |
| 89 #endif // ENABLE(MEDIA_STREAM) | 89 #endif // ENABLE(MEDIA_STREAM) |
| 90 | 90 |
| 91 #endif // MediaStreamComponent_h | 91 #endif // MediaStreamComponent_h |
| OLD | NEW |