| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #include "config.h" | 25 #include "config.h" |
| 26 | 26 |
| 27 #if ENABLE(MEDIA_STREAM) | 27 #if ENABLE(MEDIA_STREAM) |
| 28 | 28 |
| 29 #include <public/WebMediaStream.h> | 29 #include <public/WebMediaStream.h> |
| 30 | 30 |
| 31 #include "MediaStreamComponent.h" | |
| 32 #include "MediaStreamDescriptor.h" | |
| 33 #include "MediaStreamSource.h" | |
| 34 #include "UUID.h" | 31 #include "UUID.h" |
| 32 #include "core/platform/mediastream/MediaStreamComponent.h" |
| 33 #include "core/platform/mediastream/MediaStreamDescriptor.h" |
| 34 #include "core/platform/mediastream/MediaStreamSource.h" |
| 35 #include <public/WebMediaStreamSource.h> | 35 #include <public/WebMediaStreamSource.h> |
| 36 #include <public/WebMediaStreamTrack.h> | 36 #include <public/WebMediaStreamTrack.h> |
| 37 #include <public/WebString.h> | 37 #include <public/WebString.h> |
| 38 #include <wtf/OwnPtr.h> | 38 #include <wtf/OwnPtr.h> |
| 39 #include <wtf/PassOwnPtr.h> | 39 #include <wtf/PassOwnPtr.h> |
| 40 #include <wtf/Vector.h> | 40 #include <wtf/Vector.h> |
| 41 | 41 |
| 42 using namespace WebCore; | 42 using namespace WebCore; |
| 43 | 43 |
| 44 namespace WebKit { | 44 namespace WebKit { |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 } | 175 } |
| 176 | 176 |
| 177 void WebMediaStream::assign(const WebMediaStream& other) | 177 void WebMediaStream::assign(const WebMediaStream& other) |
| 178 { | 178 { |
| 179 m_private = other.m_private; | 179 m_private = other.m_private; |
| 180 } | 180 } |
| 181 | 181 |
| 182 } // namespace WebKit | 182 } // namespace WebKit |
| 183 | 183 |
| 184 #endif // ENABLE(MEDIA_STREAM) | 184 #endif // ENABLE(MEDIA_STREAM) |
| OLD | NEW |