diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-14 10:07:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-14 18:54:49 +0200 |
| commit | a3c77682ce67420ac3fba4d81847bbe170b387eb (patch) | |
| tree | c22938dae751405e5f78881a7683ab3176c77a5c /src/core/permission_manager_qt.cpp | |
| parent | d3882688a8fd70ccd4c42afd2485c3b5d3810547 (diff) | |
| parent | 1c6d01b846f2152e7215c98cfa09e668c880da7e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/3rdparty
src/core/certificate_error_controller.cpp
src/core/certificate_error_controller.h
src/core/compositor/compositor.cpp
src/core/compositor/compositor.h
src/core/compositor/display_gl_output_surface.cpp
src/core/content_browser_client_qt.cpp
src/core/core_chromium.pri
src/core/delegated_frame_host_client_qt.cpp
src/core/ozone/gl_share_context_qt.h
src/core/ozone/surface_factory_qt.cpp
src/core/permission_manager_qt.cpp
src/core/render_widget_host_view_qt.cpp
src/core/render_widget_host_view_qt.h
src/core/web_engine_context.cpp
src/core/web_engine_settings.cpp
src/core/web_event_factory.cpp
tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669
Diffstat (limited to 'src/core/permission_manager_qt.cpp')
| -rw-r--r-- | src/core/permission_manager_qt.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp index e232508b4..8b9eab3eb 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,11 @@ 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::STORAGE_ACCESS_GRANT: 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,14 +305,14 @@ 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( QWebEngineSettings::JavascriptCanAccessClipboard)) return blink::mojom::PermissionStatus::DENIED; - if (permission == content::PermissionType::CLIPBOARD_READ + if (permission == content::PermissionType::CLIPBOARD_READ_WRITE && !delegate->webEngineSettings()->testAttribute( QWebEngineSettings::JavascriptCanPaste)) return blink::mojom::PermissionStatus::DENIED; |