Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 | 27 |
| 28 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h" | 28 #include "modules/mediastream/MediaDevicesRequest.h" |
| 29 | 29 |
| 30 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" | 30 #include "bindings/v8/ExceptionState.h" |
| 31 #include "platform/weborigin/SecurityOrigin.h" | 31 #include "core/dom/Document.h" |
| 32 #include "public/platform/WebSourceInfo.h" | 32 #include "modules/mediastream/UserMediaController.h" |
| 33 #include "wtf/PassOwnPtr.h" | |
| 34 | 33 |
| 35 namespace WebCore { | 34 namespace WebCore { |
| 36 | 35 |
| 37 PassRefPtr<MediaStreamTrackSourcesRequestImpl> MediaStreamTrackSourcesRequestImp l::create(const String& origin, PassOwnPtr<MediaStreamTrackSourcesCallback> call back) | 36 PassRefPtr<MediaDevicesRequest> MediaDevicesRequest::create(ExecutionContext* co ntext, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCallback> call back, ExceptionState& exceptionState) |
| 38 { | 37 { |
| 39 return adoptRef(new MediaStreamTrackSourcesRequestImpl(origin, callback)); | 38 return adoptRef(new MediaDevicesRequest(context, controller, callback)); |
| 40 } | 39 } |
| 41 | 40 |
| 42 MediaStreamTrackSourcesRequestImpl::MediaStreamTrackSourcesRequestImpl(const Str ing& origin, PassOwnPtr<MediaStreamTrackSourcesCallback> callback) | 41 MediaDevicesRequest::MediaDevicesRequest(ExecutionContext* context, UserMediaCon troller* controller, PassOwnPtr<MediaDeviceInfoCallback> callback) |
| 43 : m_callback(callback) | 42 : ContextLifecycleObserver(context) |
| 44 , m_scheduledEventTimer(this, &MediaStreamTrackSourcesRequestImpl::scheduled EventTimerFired) | 43 , m_controller(controller) |
| 45 { | 44 , m_callback(callback) |
| 46 m_origin = origin; | |
| 47 } | |
| 48 | |
| 49 MediaStreamTrackSourcesRequestImpl::~MediaStreamTrackSourcesRequestImpl() | |
| 50 { | 45 { |
| 51 } | 46 } |
| 52 | 47 |
| 53 void MediaStreamTrackSourcesRequestImpl::requestSucceeded(const blink::WebVector <blink::WebSourceInfo>& webSourceInfos) | 48 MediaDevicesRequest::~MediaDevicesRequest() |
| 54 { | 49 { |
| 55 ASSERT(m_callback && !m_scheduledEventTimer.isActive()); | |
| 56 | |
| 57 for (size_t i = 0; i < webSourceInfos.size(); ++i) | |
| 58 m_sourceInfos.append(SourceInfo::create(webSourceInfos[i])); | |
| 59 | |
| 60 m_protect = this; | |
| 61 m_scheduledEventTimer.startOneShot(0); | |
| 62 } | 50 } |
| 63 | 51 |
| 64 void MediaStreamTrackSourcesRequestImpl::scheduledEventTimerFired(Timer<MediaStr eamTrackSourcesRequestImpl>*) | 52 Document* MediaDevicesRequest::ownerDocument() |
| 65 { | 53 { |
| 66 m_callback->handleEvent(m_sourceInfos); | 54 if (ExecutionContext* context = executionContext()) { |
| 67 m_callback.clear(); | 55 return toDocument(context); |
| 68 m_protect.release(); | 56 } |
| 57 | |
| 58 return 0; | |
| 59 } | |
| 60 | |
| 61 void MediaDevicesRequest::start() | |
| 62 { | |
| 63 if (m_controller) | |
| 64 m_controller->requestMediaDevices(this); | |
| 65 } | |
| 66 | |
| 67 void MediaDevicesRequest::succeed(const MediaDeviceInfoVector& mediaDevices) | |
| 68 { | |
| 69 if (!executionContext()) | |
| 70 return; | |
| 71 | |
| 72 m_callback->handleEvent(mediaDevices); | |
|
abarth-chromium
2014/01/28 06:49:49
Generally its better to use ActiveDOMObject for th
Tommy Widenflycht
2014/01/28 22:35:02
Done.
| |
| 73 } | |
| 74 | |
| 75 void MediaDevicesRequest::contextDestroyed() | |
| 76 { | |
| 77 RefPtr<MediaDevicesRequest> protect(this); | |
| 78 | |
| 79 if (m_controller) { | |
| 80 m_controller->cancelMediaDevicesRequest(this); | |
| 81 m_controller = 0; | |
| 82 } | |
| 83 | |
| 84 ContextLifecycleObserver::contextDestroyed(); | |
| 69 } | 85 } |
| 70 | 86 |
| 71 } // namespace WebCore | 87 } // namespace WebCore |
| OLD | NEW |