diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-04 15:13:31 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-04-05 11:41:08 +0000 |
commit | 3e9a6407bbbc5f83eb8bd56c5c1d899dba9bc56f (patch) | |
tree | b525366744fc29fd0f5ed0e28681e430866b6e52 /src/core/web_contents_adapter.cpp | |
parent | 9da7a0649cfa65c784e86cf3496b188c9d8d15c4 (diff) |
Implement CheckMediaAccessPermission
Fixes access of label of MediaStream tracks
Also fixes the logged error:
WebContentsDelegate::CheckMediaAccessPermission: Not supported.
Change-Id: I3fee9ccd9e8b2e5cbd6b707336cc61425a44ba31
Task-number: QTBUG-52216
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
-rw-r--r-- | src/core/web_contents_adapter.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 608dbf7e7..cd6505df5 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -844,6 +844,11 @@ void WebContentsAdapter::wasHidden() void WebContentsAdapter::grantMediaAccessPermission(const QUrl &securityOrigin, WebContentsAdapterClient::MediaRequestFlags flags) { Q_D(WebContentsAdapter); + // Let the permission manager remember the reply. + if (flags & WebContentsAdapterClient::MediaAudioCapture) + d->browserContextAdapter->permissionRequestReply(securityOrigin, BrowserContextAdapter::AudioCapturePermission, true); + if (flags & WebContentsAdapterClient::MediaVideoCapture) + d->browserContextAdapter->permissionRequestReply(securityOrigin, BrowserContextAdapter::VideoCapturePermission, true); MediaCaptureDevicesDispatcher::GetInstance()->handleMediaAccessPermissionResponse(d->webContents.get(), securityOrigin, flags); } |