| 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/WebMediaStreamTrack.h> | 29 #include <public/WebMediaStreamTrack.h> |
| 30 | 30 |
| 31 #include "MediaStreamComponent.h" | 31 #include "core/platform/mediastream/MediaStreamComponent.h" |
| 32 #include <public/WebMediaStream.h> | 32 #include <public/WebMediaStream.h> |
| 33 #include <public/WebMediaStreamSource.h> | 33 #include <public/WebMediaStreamSource.h> |
| 34 #include <public/WebString.h> | 34 #include <public/WebString.h> |
| 35 #include <wtf/Vector.h> | 35 #include <wtf/Vector.h> |
| 36 | 36 |
| 37 using namespace WebCore; | 37 using namespace WebCore; |
| 38 | 38 |
| 39 namespace WebKit { | 39 namespace WebKit { |
| 40 | 40 |
| 41 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponen
t> mediaStreamComponent) | 41 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponen
t> mediaStreamComponent) |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 } | 104 } |
| 105 | 105 |
| 106 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) | 106 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) |
| 107 { | 107 { |
| 108 m_private = other.m_private; | 108 m_private = other.m_private; |
| 109 } | 109 } |
| 110 | 110 |
| 111 } // namespace WebKit | 111 } // namespace WebKit |
| 112 | 112 |
| 113 #endif // ENABLE(MEDIA_STREAM) | 113 #endif // ENABLE(MEDIA_STREAM) |
| OLD | NEW |