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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/UserMediaController.h

Issue 2489823002: Revert "Remove MediaStreamTrack.getSources()." (Closed)
Patch Set: rebase 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
OLDNEW
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 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
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public: 42 public:
43 static UserMediaController* create(std::unique_ptr<UserMediaClient>); 43 static UserMediaController* create(std::unique_ptr<UserMediaClient>);
44 44
45 DECLARE_VIRTUAL_TRACE(); 45 DECLARE_VIRTUAL_TRACE();
46 46
47 UserMediaClient* client() const { return m_client.get(); } 47 UserMediaClient* client() const { return m_client.get(); }
48 48
49 void requestUserMedia(UserMediaRequest*); 49 void requestUserMedia(UserMediaRequest*);
50 void cancelUserMediaRequest(UserMediaRequest*); 50 void cancelUserMediaRequest(UserMediaRequest*);
51 void requestMediaDevices(MediaDevicesRequest*); 51 void requestMediaDevices(MediaDevicesRequest*);
52 void requestSources(MediaStreamTrackSourcesRequest*);
52 void setMediaDeviceChangeObserver(MediaDevices*); 53 void setMediaDeviceChangeObserver(MediaDevices*);
53 54
54 static const char* supplementName(); 55 static const char* supplementName();
55 static UserMediaController* from(LocalFrame* frame) { 56 static UserMediaController* from(LocalFrame* frame) {
56 return static_cast<UserMediaController*>( 57 return static_cast<UserMediaController*>(
57 Supplement<LocalFrame>::from(frame, supplementName())); 58 Supplement<LocalFrame>::from(frame, supplementName()));
58 } 59 }
59 60
60 private: 61 private:
61 explicit UserMediaController(std::unique_ptr<UserMediaClient>); 62 explicit UserMediaController(std::unique_ptr<UserMediaClient>);
62 63
63 std::unique_ptr<UserMediaClient> m_client; 64 std::unique_ptr<UserMediaClient> m_client;
64 }; 65 };
65 66
66 inline void UserMediaController::requestUserMedia(UserMediaRequest* request) { 67 inline void UserMediaController::requestUserMedia(UserMediaRequest* request) {
67 m_client->requestUserMedia(request); 68 m_client->requestUserMedia(request);
68 } 69 }
69 70
70 inline void UserMediaController::cancelUserMediaRequest( 71 inline void UserMediaController::cancelUserMediaRequest(
71 UserMediaRequest* request) { 72 UserMediaRequest* request) {
72 m_client->cancelUserMediaRequest(request); 73 m_client->cancelUserMediaRequest(request);
73 } 74 }
74 75
75 inline void UserMediaController::requestMediaDevices( 76 inline void UserMediaController::requestMediaDevices(
76 MediaDevicesRequest* request) { 77 MediaDevicesRequest* request) {
77 m_client->requestMediaDevices(request); 78 m_client->requestMediaDevices(request);
78 } 79 }
79 80
81 inline void UserMediaController::requestSources(
82 MediaStreamTrackSourcesRequest* request) {
83 m_client->requestSources(request);
84 }
85
80 inline void UserMediaController::setMediaDeviceChangeObserver( 86 inline void UserMediaController::setMediaDeviceChangeObserver(
81 MediaDevices* observer) { 87 MediaDevices* observer) {
82 m_client->setMediaDeviceChangeObserver(observer); 88 m_client->setMediaDeviceChangeObserver(observer);
83 } 89 }
84 90
85 } // namespace blink 91 } // namespace blink
86 92
87 #endif // UserMediaController_h 93 #endif // UserMediaController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698