summaryrefslogtreecommitdiffstats
path: root/src/core/media_capture_devices_dispatcher.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-25 14:24:01 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-27 10:46:39 +0000
commit9787fb89c0c0234366e5d88b2e9194518d2590a3 (patch)
treeb29fdb00203e7d3754cb35233173b3677d19bc6c /src/core/media_capture_devices_dispatcher.h
parent95baba26936cdabe5cf4d5eaa4d59f97e4a2102d (diff)
White-space cleanup of media_capture_devices_dispatcher files
In preparation for a deeper cleanup to avoid mixing whitespace and non- whitespace changes. Change-Id: Iedbaf304a06b227799bbe74c71c570b7a675aea4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/core/media_capture_devices_dispatcher.h')
-rw-r--r--src/core/media_capture_devices_dispatcher.h105
1 files changed, 53 insertions, 52 deletions
diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
index 2aff0b28e..0e5aa38be 100644
--- a/src/core/media_capture_devices_dispatcher.h
+++ b/src/core/media_capture_devices_dispatcher.h
@@ -64,77 +64,78 @@ namespace QtWebEngineCore {
// This singleton is used to receive updates about media events from the content
// layer. Based on Chrome's implementation.
class MediaCaptureDevicesDispatcher : public content::MediaObserver,
- public content::NotificationObserver {
- public:
+ public content::NotificationObserver
+{
+public:
+ static MediaCaptureDevicesDispatcher *GetInstance();
- static MediaCaptureDevicesDispatcher *GetInstance();
+ void processMediaAccessRequest(WebContentsAdapterClient *, content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback);
- void processMediaAccessRequest(WebContentsAdapterClient *, content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback);
+ // Called back from our WebContentsAdapter to grant the requested permission.
+ void handleMediaAccessPermissionResponse(content::WebContents *, const QUrl &securityOrigin, WebContentsAdapterClient::MediaRequestFlags);
- // Called back from our WebContentsAdapter to grant the requested permission.
- void handleMediaAccessPermissionResponse(content::WebContents *, const QUrl &securityOrigin, WebContentsAdapterClient::MediaRequestFlags);
+private:
+ void getDefaultDevices(const std::string &audioDeviceId, const std::string &videoDeviceId, bool audio, bool video, content::MediaStreamDevices *);
- private:
- void getDefaultDevices(const std::string &audioDeviceId, const std::string &videoDeviceId, bool audio, bool video, content::MediaStreamDevices *);
+ // Overridden from content::MediaObserver:
+ void OnAudioCaptureDevicesChanged() override {}
+ void OnVideoCaptureDevicesChanged() override {}
+ void OnMediaRequestStateChanged(int render_process_id,
+ int render_frame_id,
+ int page_request_id,
+ const GURL &security_origin,
+ content::MediaStreamType stream_type,
+ content::MediaRequestState state) override;
- // Overridden from content::MediaObserver:
- void OnAudioCaptureDevicesChanged() override { }
- void OnVideoCaptureDevicesChanged() override { }
- void OnMediaRequestStateChanged(int render_process_id,
- int render_frame_id,
- int page_request_id,
- const GURL& security_origin,
- content::MediaStreamType stream_type,
- content::MediaRequestState state) override;
+ void OnCreatingAudioStream(int /*render_process_id*/, int /*render_frame_id*/) override {}
+ void OnSetCapturingLinkSecured(int /*render_process_id*/,
+ int /*render_frame_id*/,
+ int /*page_request_id*/,
+ content::MediaStreamType /*stream_type*/,
+ bool /*is_secure*/) override {}
- void OnCreatingAudioStream(int /*render_process_id*/, int /*render_frame_id*/) override { }
- void OnSetCapturingLinkSecured(int /*render_process_id*/,
- int /*render_frame_id*/,
- int /*page_request_id*/,
- content::MediaStreamType /*stream_type*/,
- bool /*is_secure*/) override { }
+ DesktopStreamsRegistry *getDesktopStreamsRegistry();
- DesktopStreamsRegistry *getDesktopStreamsRegistry();
+ friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;
- friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;
+ typedef base::RepeatingCallback<void(const content::MediaStreamDevices &devices,
+ content::MediaStreamRequestResult result,
+ std::unique_ptr<content::MediaStreamUI> ui)>
+ RepeatingMediaResponseCallback;
- typedef base::RepeatingCallback<void(const content::MediaStreamDevices& devices,
- content::MediaStreamRequestResult result,
- std::unique_ptr<content::MediaStreamUI> ui)> RepeatingMediaResponseCallback;
+ struct PendingAccessRequest {
+ PendingAccessRequest(const content::MediaStreamRequest &request, const RepeatingMediaResponseCallback &callback);
+ ~PendingAccessRequest();
- struct PendingAccessRequest {
- PendingAccessRequest(const content::MediaStreamRequest &request, const RepeatingMediaResponseCallback &callback);
- ~PendingAccessRequest();
+ content::MediaStreamRequest request;
+ RepeatingMediaResponseCallback callback;
+ };
+ typedef base::circular_deque<PendingAccessRequest> RequestsQueue;
+ typedef std::map<content::WebContents *, RequestsQueue> RequestsQueues;
- content::MediaStreamRequest request;
- RepeatingMediaResponseCallback callback;
- };
- typedef base::circular_deque<PendingAccessRequest> RequestsQueue;
- typedef std::map<content::WebContents *, RequestsQueue> RequestsQueues;
+ MediaCaptureDevicesDispatcher();
+ virtual ~MediaCaptureDevicesDispatcher();
- MediaCaptureDevicesDispatcher();
- virtual ~MediaCaptureDevicesDispatcher();
+ // content::NotificationObserver implementation.
+ void Observe(int type, const content::NotificationSource &source, const content::NotificationDetails &details) override;
- // content::NotificationObserver implementation.
- void Observe(int type, const content::NotificationSource &source, const content::NotificationDetails &details) override;
+ // Helpers for ProcessMediaAccessRequest().
+ void processDesktopCaptureAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback);
+ void enqueueMediaAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback);
+ void ProcessQueuedAccessRequest(content::WebContents *);
- // Helpers for ProcessMediaAccessRequest().
- void processDesktopCaptureAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback);
- void enqueueMediaAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback);
- void ProcessQueuedAccessRequest(content::WebContents *);
+ // Called by the MediaObserver() functions, executed on UI thread.
+ void updateMediaRequestStateOnUIThread(int render_process_id, int render_frame_id, int page_request_id, const GURL &security_origin, content::MediaStreamType stream_type, content::MediaRequestState state);
- // Called by the MediaObserver() functions, executed on UI thread.
- void updateMediaRequestStateOnUIThread(int render_process_id, int render_frame_id, int page_request_id, const GURL& security_origin, content::MediaStreamType stream_type, content::MediaRequestState state);
+ RequestsQueues m_pendingRequests;
- RequestsQueues m_pendingRequests;
+ std::unique_ptr<DesktopStreamsRegistry> m_desktopStreamsRegistry;
- std::unique_ptr<DesktopStreamsRegistry> m_desktopStreamsRegistry;
+ content::NotificationRegistrar m_notificationsRegistrar;
- content::NotificationRegistrar m_notificationsRegistrar;
-
- DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
+ DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
};
} // namespace QtWebEngineCore
-#endif // MEDIA_CAPTURE_DEVICES_DISPATCHER_H
+#endif // MEDIA_CAPTURE_DEVICES_DISPATCHER_H