diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-03 15:37:26 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-03 15:37:26 +0100 |
| commit | 80ec5b0367b8e7aedd51ecfac459c53670fc7c35 (patch) | |
| tree | fa1682cd8a96374c1bd919d62b16fa860fb87def /src/core | |
| parent | c9c038430bf21909f2038ba66a6c85faf0989dd4 (diff) | |
| parent | 171bdc9f0e9a563b0d70643637d0b6a8e5661d17 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/quick/qquickwebengineview/BLACKLIST
Change-Id: I365daa73d2eb422ac916c32b86c5ad0d3c32086d
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/permission_manager_qt.cpp | 3 | ||||
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp index 9e8687a47..decc6dd7c 100644 --- a/src/core/permission_manager_qt.cpp +++ b/src/core/permission_manager_qt.cpp @@ -67,6 +67,8 @@ ProfileAdapter::PermissionType toQt(content::PermissionType type) return ProfileAdapter::ClipboardWrite; case content::PermissionType::NOTIFICATIONS: return ProfileAdapter::NotificationPermission; + case content::PermissionType::ACCESSIBILITY_EVENTS: + return ProfileAdapter::UnsupportedPermission; case content::PermissionType::FLASH: case content::PermissionType::MIDI_SYSEX: case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: @@ -74,7 +76,6 @@ ProfileAdapter::PermissionType toQt(content::PermissionType type) case content::PermissionType::DURABLE_STORAGE: case content::PermissionType::BACKGROUND_SYNC: case content::PermissionType::SENSORS: - case content::PermissionType::ACCESSIBILITY_EVENTS: case content::PermissionType::PAYMENT_HANDLER: case content::PermissionType::BACKGROUND_FETCH: case content::PermissionType::IDLE_DETECTION: diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 9dc2f7b8b..138ea7039 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -1010,7 +1010,10 @@ QAccessibleInterface *WebContentsAdapter::browserAccessible() CHECK_INITIALIZED(nullptr); content::RenderViewHost *rvh = m_webContents->GetRenderViewHost(); Q_ASSERT(rvh); - content::BrowserAccessibilityManager *manager = static_cast<content::RenderFrameHostImpl*>(rvh->GetMainFrame())->GetOrCreateBrowserAccessibilityManager(); + content::RenderFrameHostImpl *rfh = static_cast<content::RenderFrameHostImpl *>(rvh->GetMainFrame()); + if (!rfh) + return nullptr; + content::BrowserAccessibilityManager *manager = rfh->GetOrCreateBrowserAccessibilityManager(); if (!manager) // FIXME! return nullptr; content::BrowserAccessibility *acc = manager->GetRoot(); |