summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-08-24 14:49:53 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-26 18:37:05 +0000
commit0b723ae7c6dba37dd4741408208cdf44ffc0c427 (patch)
treeffcbbddff8c7b29868dfec008d393b6a1757af8b
parent45981d7d84f2f05b60dcf785d6cefa039508e720 (diff)
Remove unneeded extension -> file access privilege
It was hacked in before we got guest views working for the pdf viewer, but should no longer be needed. Change-Id: I3085c1ba591c600942e488751ada12473c6454d0 Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io> (cherry picked from commit 5309b594a9939023ce3161e1713b534c90ef3605) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/core/content_browser_client_qt.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index f580e6f77..cab8f09b1 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -1086,12 +1086,8 @@ void ContentBrowserClientQt::RegisterNonNetworkSubresourceURLLoaderFactories(int
url = web_contents->GetVisibleURL();
// Install file scheme if necessary:
- // FIXME: "extension -> file" will not be needed after switching to using transferable url loaders and guest views.
bool install_file_scheme = false;
-#if BUILDFLAG(ENABLE_EXTENSIONS)
- install_file_scheme = install_file_scheme || url.SchemeIs(extensions::kExtensionScheme);
-#endif
- if (!install_file_scheme && web_contents) {
+ if (web_contents) {
const auto *settings = static_cast<WebContentsDelegateQt *>(web_contents->GetDelegate())->webEngineSettings();
if (settings->testAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls)) {
for (const auto &local_scheme : url::GetLocalSchemes()) {