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

Side by Side Diff: third_party/WebKit/Source/web/UserMediaClientImpl.cpp

Issue 2493823002: Revert of Revert "Remove MediaStreamTrack.getSources()." (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/web/UserMediaClientImpl.h ('k') | third_party/WebKit/public/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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 "web/UserMediaClientImpl.h" 31 #include "web/UserMediaClientImpl.h"
32 32
33 #include "public/platform/WebMediaStreamTrackSourcesRequest.h"
34 #include "public/web/WebFrameClient.h" 33 #include "public/web/WebFrameClient.h"
35 #include "public/web/WebMediaDeviceChangeObserver.h" 34 #include "public/web/WebMediaDeviceChangeObserver.h"
36 #include "public/web/WebMediaDevicesRequest.h" 35 #include "public/web/WebMediaDevicesRequest.h"
37 #include "public/web/WebUserMediaClient.h" 36 #include "public/web/WebUserMediaClient.h"
38 #include "public/web/WebUserMediaRequest.h" 37 #include "public/web/WebUserMediaRequest.h"
39 #include "web/WebLocalFrameImpl.h" 38 #include "web/WebLocalFrameImpl.h"
40 #include "wtf/RefPtr.h" 39 #include "wtf/RefPtr.h"
41 40
42 namespace blink { 41 namespace blink {
43 42
44 UserMediaClientImpl::UserMediaClientImpl(WebUserMediaClient* client) 43 UserMediaClientImpl::UserMediaClientImpl(WebUserMediaClient* client)
45 : m_client(client) {} 44 : m_client(client) {}
46 45
47 void UserMediaClientImpl::requestUserMedia(UserMediaRequest* request) { 46 void UserMediaClientImpl::requestUserMedia(UserMediaRequest* request) {
48 if (m_client) 47 if (m_client)
49 m_client->requestUserMedia(request); 48 m_client->requestUserMedia(request);
50 } 49 }
51 50
52 void UserMediaClientImpl::cancelUserMediaRequest(UserMediaRequest* request) { 51 void UserMediaClientImpl::cancelUserMediaRequest(UserMediaRequest* request) {
53 if (m_client) 52 if (m_client)
54 m_client->cancelUserMediaRequest(WebUserMediaRequest(request)); 53 m_client->cancelUserMediaRequest(WebUserMediaRequest(request));
55 } 54 }
56 55
57 void UserMediaClientImpl::requestMediaDevices(MediaDevicesRequest* request) { 56 void UserMediaClientImpl::requestMediaDevices(MediaDevicesRequest* request) {
58 if (m_client) 57 if (m_client)
59 m_client->requestMediaDevices(request); 58 m_client->requestMediaDevices(request);
60 } 59 }
61 60
62 void UserMediaClientImpl::requestSources(
63 MediaStreamTrackSourcesRequest* request) {
64 if (m_client)
65 m_client->requestSources(request);
66 }
67
68 void UserMediaClientImpl::setMediaDeviceChangeObserver(MediaDevices* observer) { 61 void UserMediaClientImpl::setMediaDeviceChangeObserver(MediaDevices* observer) {
69 if (m_client) 62 if (m_client)
70 m_client->setMediaDeviceChangeObserver( 63 m_client->setMediaDeviceChangeObserver(
71 WebMediaDeviceChangeObserver(observer)); 64 WebMediaDeviceChangeObserver(observer));
72 } 65 }
73 66
74 } // namespace blink 67 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/UserMediaClientImpl.h ('k') | third_party/WebKit/public/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698