Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: Source/modules/mediastream/MediaDevicesRequest.cpp

Issue 145583015: MediaStream API: Implement Navigator.getMediaDevices Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed review comments and added a simple test Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include "modules/mediastream/RTCDTMFToneChangeEvent.h"
28 27
29 #include "core/events/ThreadLocalEventNames.h" 28 #include "modules/mediastream/MediaDevicesRequest.h"
29
30 #include "bindings/v8/ExceptionState.h"
31 #include "core/dom/Document.h"
32 #include "modules/mediastream/UserMediaController.h"
30 33
31 namespace WebCore { 34 namespace WebCore {
32 35
33 PassRefPtr<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create() 36 PassRefPtr<MediaDevicesRequest> MediaDevicesRequest::create(ExecutionContext* co ntext, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCallback> call back, ExceptionState& exceptionState)
34 { 37 {
35 return adoptRef(new RTCDTMFToneChangeEvent); 38 RefPtr<MediaDevicesRequest> request = adoptRef(new MediaDevicesRequest(conte xt, controller, callback));
39 request->suspendIfNeeded();
40 return request.release();
36 } 41 }
37 42
38 PassRefPtr<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create(const String& tone) 43 MediaDevicesRequest::MediaDevicesRequest(ExecutionContext* context, UserMediaCon troller* controller, PassOwnPtr<MediaDeviceInfoCallback> callback)
39 { 44 : ActiveDOMObject(context)
40 return adoptRef(new RTCDTMFToneChangeEvent(tone)); 45 , m_controller(controller)
41 } 46 , m_callback(callback)
42
43 PassRefPtr<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create(const AtomicSt ring& type, const RTCDTMFToneChangeEventInit& initializer)
44 {
45 ASSERT(type == EventTypeNames::tonechange);
46 return adoptRef(new RTCDTMFToneChangeEvent(initializer));
47 }
48
49 RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent()
50 {
51 ScriptWrappable::init(this);
52 }
53
54 RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent(const String& tone)
55 : Event(EventTypeNames::tonechange, false, false)
56 , m_tone(tone)
57 {
58 ScriptWrappable::init(this);
59 }
60
61 RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent(const RTCDTMFToneChangeEventInit& initializer)
62 : Event(EventTypeNames::tonechange, initializer)
63 , m_tone(initializer.tone)
64 {
65 ScriptWrappable::init(this);
66 }
67
68 RTCDTMFToneChangeEvent::~RTCDTMFToneChangeEvent()
69 { 47 {
70 } 48 }
71 49
72 const String& RTCDTMFToneChangeEvent::tone() const 50 MediaDevicesRequest::~MediaDevicesRequest()
73 { 51 {
74 return m_tone;
75 } 52 }
76 53
77 const AtomicString& RTCDTMFToneChangeEvent::interfaceName() const 54 Document* MediaDevicesRequest::ownerDocument()
78 { 55 {
79 return EventNames::RTCDTMFToneChangeEvent; 56 if (ExecutionContext* context = executionContext()) {
57 return toDocument(context);
58 }
59
60 return 0;
61 }
62
63 void MediaDevicesRequest::start()
64 {
65 if (m_controller)
66 m_controller->requestMediaDevices(this);
67 }
68
69 void MediaDevicesRequest::succeed(const MediaDeviceInfoVector& mediaDevices)
70 {
71 if (!executionContext() || !m_callback)
72 return;
73
74 m_callback->handleEvent(mediaDevices);
75 }
76
77 void MediaDevicesRequest::stop()
78 {
79 m_callback.clear();
80 m_controller = 0;
80 } 81 }
81 82
82 } // namespace WebCore 83 } // namespace WebCore
83
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaDevicesRequest.h ('k') | Source/modules/mediastream/NavigatorMediaStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698