| 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 16 matching lines...) Expand all Loading... |
| 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 <public/WebMediaStreamSourcesRequest.h> | 35 #include <public/WebMediaStreamSourcesRequest.h> |
| 36 | 36 |
| 37 #include "MediaStreamSource.h" | 37 #include "core/platform/mediastream/MediaStreamSource.h" |
| 38 #include "MediaStreamSourcesQueryClient.h" | 38 #include "core/platform/mediastream/MediaStreamSourcesQueryClient.h" |
| 39 #include <public/WebMediaStreamSource.h> | 39 #include <public/WebMediaStreamSource.h> |
| 40 #include <public/WebVector.h> | 40 #include <public/WebVector.h> |
| 41 #include <wtf/Vector.h> | 41 #include <wtf/Vector.h> |
| 42 | 42 |
| 43 using namespace WebCore; | 43 using namespace WebCore; |
| 44 | 44 |
| 45 namespace WebKit { | 45 namespace WebKit { |
| 46 | 46 |
| 47 WebMediaStreamSourcesRequest::WebMediaStreamSourcesRequest(const PassRefPtr<WebC
ore::MediaStreamSourcesQueryClient>& queryClient) | 47 WebMediaStreamSourcesRequest::WebMediaStreamSourcesRequest(const PassRefPtr<WebC
ore::MediaStreamSourcesQueryClient>& queryClient) |
| 48 : m_private(queryClient) | 48 : m_private(queryClient) |
| (...skipping 30 matching lines...) Expand all Loading... |
| 79 MediaStreamSource* curr = videoSources[i]; | 79 MediaStreamSource* curr = videoSources[i]; |
| 80 video.append(curr); | 80 video.append(curr); |
| 81 } | 81 } |
| 82 m_private->didCompleteQuery(audio, video); | 82 m_private->didCompleteQuery(audio, video); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace WebKit | 85 } // namespace WebKit |
| 86 | 86 |
| 87 #endif // ENABLE(MEDIA_STREAM) | 87 #endif // ENABLE(MEDIA_STREAM) |
| 88 | 88 |
| OLD | NEW |