| 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h" | 27 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h" |
| 28 | 28 |
| 29 #include "core/dom/CrossThreadTask.h" |
| 29 #include "core/dom/ExecutionContext.h" | 30 #include "core/dom/ExecutionContext.h" |
| 30 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" | 31 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" |
| 31 #include "platform/weborigin/SecurityOrigin.h" | 32 #include "platform/weborigin/SecurityOrigin.h" |
| 32 #include "public/platform/WebSourceInfo.h" | 33 #include "public/platform/WebSourceInfo.h" |
| 33 #include "wtf/Functional.h" | 34 #include "wtf/Functional.h" |
| 34 #include "wtf/PassOwnPtr.h" | 35 #include "wtf/PassOwnPtr.h" |
| 35 | 36 |
| 36 namespace WebCore { | 37 namespace WebCore { |
| 37 | 38 |
| 38 MediaStreamTrackSourcesRequestImpl* MediaStreamTrackSourcesRequestImpl::create(E
xecutionContext& context, PassOwnPtr<MediaStreamTrackSourcesCallback> callback) | 39 MediaStreamTrackSourcesRequestImpl* MediaStreamTrackSourcesRequestImpl::create(E
xecutionContext& context, PassOwnPtr<MediaStreamTrackSourcesCallback> callback) |
| (...skipping 15 matching lines...) Expand all Loading... |
| 54 { | 55 { |
| 55 return m_executionContext->securityOrigin()->toString(); | 56 return m_executionContext->securityOrigin()->toString(); |
| 56 } | 57 } |
| 57 | 58 |
| 58 void MediaStreamTrackSourcesRequestImpl::requestSucceeded(const blink::WebVector
<blink::WebSourceInfo>& webSourceInfos) | 59 void MediaStreamTrackSourcesRequestImpl::requestSucceeded(const blink::WebVector
<blink::WebSourceInfo>& webSourceInfos) |
| 59 { | 60 { |
| 60 ASSERT(m_callback); | 61 ASSERT(m_callback); |
| 61 | 62 |
| 62 for (size_t i = 0; i < webSourceInfos.size(); ++i) | 63 for (size_t i = 0; i < webSourceInfos.size(); ++i) |
| 63 m_sourceInfos.append(SourceInfo::create(webSourceInfos[i])); | 64 m_sourceInfos.append(SourceInfo::create(webSourceInfos[i])); |
| 64 m_executionContext->postTask(bind(&MediaStreamTrackSourcesRequestImpl::perfo
rmCallback, this)); | 65 m_executionContext->postTask(createCrossThreadTask(&MediaStreamTrackSourcesR
equestImpl::performCallback, this)); |
| 65 } | 66 } |
| 66 | 67 |
| 67 void MediaStreamTrackSourcesRequestImpl::performCallback() | 68 void MediaStreamTrackSourcesRequestImpl::performCallback() |
| 68 { | 69 { |
| 69 m_callback->handleEvent(m_sourceInfos); | 70 m_callback->handleEvent(m_sourceInfos); |
| 70 m_callback.clear(); | 71 m_callback.clear(); |
| 71 } | 72 } |
| 72 | 73 |
| 73 void MediaStreamTrackSourcesRequestImpl::trace(Visitor* visitor) | 74 void MediaStreamTrackSourcesRequestImpl::trace(Visitor* visitor) |
| 74 { | 75 { |
| 75 visitor->trace(m_executionContext); | 76 visitor->trace(m_executionContext); |
| 76 visitor->trace(m_sourceInfos); | 77 visitor->trace(m_sourceInfos); |
| 77 MediaStreamTrackSourcesRequest::trace(visitor); | 78 MediaStreamTrackSourcesRequest::trace(visitor); |
| 78 } | 79 } |
| 79 | 80 |
| 80 } // namespace WebCore | 81 } // namespace WebCore |
| OLD | NEW |