diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-03 16:01:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-09 15:19:07 +0200 |
| commit | cd61343ceb4a3de8ce16082917a2f197b2481d08 (patch) | |
| tree | ae88767edf6b3dc07b8dcf54c97a779eb2812768 /src/core/permission_manager_qt.cpp | |
| parent | fc3893ea80296bd17e1797d5caf4479e0be4afd1 (diff) | |
Chromium 81-based adaptations
Change-Id: Ie422b327025da084bc8038c7a0aadee2db801f29
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/permission_manager_qt.cpp')
| -rw-r--r-- | src/core/permission_manager_qt.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp index ece74b123..5c33ca702 100644 --- a/src/core/permission_manager_qt.cpp +++ b/src/core/permission_manager_qt.cpp @@ -61,9 +61,9 @@ static ProfileAdapter::PermissionType toQt(content::PermissionType type) return ProfileAdapter::AudioCapturePermission; case content::PermissionType::VIDEO_CAPTURE: return ProfileAdapter::VideoCapturePermission; - case content::PermissionType::CLIPBOARD_READ: + case content::PermissionType::CLIPBOARD_READ_WRITE: return ProfileAdapter::ClipboardRead; - case content::PermissionType::CLIPBOARD_WRITE: + case content::PermissionType::CLIPBOARD_SANITIZED_WRITE: return ProfileAdapter::ClipboardWrite; case content::PermissionType::NOTIFICATIONS: return ProfileAdapter::NotificationPermission; @@ -83,8 +83,10 @@ static ProfileAdapter::PermissionType toQt(content::PermissionType type) case content::PermissionType::WAKE_LOCK_SCREEN: case content::PermissionType::WAKE_LOCK_SYSTEM: case content::PermissionType::NFC: + case content::PermissionType::AR: + case content::PermissionType::VR: case content::PermissionType::NUM: - NOTIMPLEMENTED() << "Unsupported permission type: " << static_cast<int>(type); + LOG(INFO) << "Unsupported permission type: " << static_cast<int>(type); break; } return ProfileAdapter::UnsupportedPermission; @@ -302,13 +304,13 @@ blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForFrame( content::RenderFrameHost *render_frame_host, const GURL &requesting_origin) { - if (permission == content::PermissionType::CLIPBOARD_READ || - permission == content::PermissionType::CLIPBOARD_WRITE) { + if (permission == content::PermissionType::CLIPBOARD_READ_WRITE || + permission == content::PermissionType::CLIPBOARD_SANITIZED_WRITE) { WebContentsDelegateQt *delegate = static_cast<WebContentsDelegateQt *>( content::WebContents::FromRenderFrameHost(render_frame_host)->GetDelegate()); if (!delegate->webEngineSettings()->testAttribute(WebEngineSettings::JavascriptCanAccessClipboard)) return blink::mojom::PermissionStatus::DENIED; - if (permission == content::PermissionType::CLIPBOARD_READ && + if (permission == content::PermissionType::CLIPBOARD_READ_WRITE && !delegate->webEngineSettings()->testAttribute(WebEngineSettings::JavascriptCanPaste)) return blink::mojom::PermissionStatus::DENIED; return blink::mojom::PermissionStatus::GRANTED; |