| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 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 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #if ENABLE(MEDIA_STREAM) | 33 #if ENABLE(MEDIA_STREAM) |
| 34 | 34 |
| 35 #include "MediaStreamCenterChromium.h" | 35 #include "core/platform/mediastream/chromium/MediaStreamCenterChromium.h" |
| 36 | 36 |
| 37 #include "MediaStreamDescriptor.h" | 37 #include "core/platform/mediastream/MediaStreamDescriptor.h" |
| 38 #include "MediaStreamSourcesQueryClient.h" | 38 #include "core/platform/mediastream/MediaStreamSourcesQueryClient.h" |
| 39 #include <public/Platform.h> | 39 #include <public/Platform.h> |
| 40 #include <public/WebMediaStream.h> | 40 #include <public/WebMediaStream.h> |
| 41 #include <public/WebMediaStreamCenter.h> | 41 #include <public/WebMediaStreamCenter.h> |
| 42 #include <public/WebMediaStreamSourcesRequest.h> | 42 #include <public/WebMediaStreamSourcesRequest.h> |
| 43 #include <public/WebMediaStreamTrack.h> | 43 #include <public/WebMediaStreamTrack.h> |
| 44 #include <wtf/MainThread.h> | 44 #include <wtf/MainThread.h> |
| 45 #include <wtf/PassOwnPtr.h> | 45 #include <wtf/PassOwnPtr.h> |
| 46 | 46 |
| 47 namespace WebCore { | 47 namespace WebCore { |
| 48 | 48 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 } | 112 } |
| 113 | 113 |
| 114 void MediaStreamCenterChromium::stopLocalMediaStream(const WebKit::WebMediaStrea
m& stream) | 114 void MediaStreamCenterChromium::stopLocalMediaStream(const WebKit::WebMediaStrea
m& stream) |
| 115 { | 115 { |
| 116 endLocalMediaStream(stream); | 116 endLocalMediaStream(stream); |
| 117 } | 117 } |
| 118 | 118 |
| 119 } // namespace WebCore | 119 } // namespace WebCore |
| 120 | 120 |
| 121 #endif // ENABLE(MEDIA_STREAM) | 121 #endif // ENABLE(MEDIA_STREAM) |
| OLD | NEW |