diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 3 | ||||
| -rw-r--r-- | src/core/profile_adapter.cpp | 11 | ||||
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 9 |
3 files changed, 1 insertions, 22 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index f17bc5025..9b0745794 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -1107,8 +1107,7 @@ void ContentBrowserClientQt::RegisterNonNetworkSubresourceURLLoaderFactories(int // Install file scheme if necessary: // FIXME: "extension -> file" will not be needed after switching to using transferable url loaders and guest views. - // FIXME: "qrc -> file" should be reconsidered for Qt6. - bool install_file_scheme = url.SchemeIs("qrc"); + bool install_file_scheme = false; #if BUILDFLAG(ENABLE_EXTENSIONS) install_file_scheme = install_file_scheme || url.SchemeIs(extensions::kExtensionScheme); #endif diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp index 0072eea50..7faeecf9b 100644 --- a/src/core/profile_adapter.cpp +++ b/src/core/profile_adapter.cpp @@ -115,17 +115,6 @@ ProfileAdapter::ProfileAdapter(const QString &storageName): if (!storageName.isEmpty()) extensions::ExtensionSystem::Get(m_profile.data())->InitForRegularProfile(true); #endif - - // Allow XMLHttpRequests from qrc to file. - // ### consider removing for Qt6 - url::Origin qrc = url::Origin::Create(GURL("qrc://")); - auto pattern = network::mojom::CorsOriginPattern::New("file", "", 0, - network::mojom::CorsDomainMatchMode::kAllowSubdomains, - network::mojom::CorsPortMatchMode::kAllowAnyPort, - network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority); - std::vector<network::mojom::CorsOriginPatternPtr> list; - list.push_back(std::move(pattern)); - m_profile->GetSharedCorsOriginAccessList()->SetForOrigin(qrc, std::move(list), {}, base::BindOnce([]{})); m_cancelableTaskTracker.reset(new base::CancelableTaskTracker()); } diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 99e98985b..2ba8ad53e 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -150,15 +150,6 @@ void ContentRendererClientQt::RenderThreadStarted() InitSpellCheck(); #endif - // Allow XMLHttpRequests from qrc to file. - // ### consider removing for Qt6 - blink::WebURL qrc(GURL("qrc:")); - blink::WebString file(blink::WebString::FromASCII("file")); - blink::WebSecurityPolicy::AddOriginAccessAllowListEntry( - qrc, file, blink::WebString(), 0, network::mojom::CorsDomainMatchMode::kAllowSubdomains, - network::mojom::CorsPortMatchMode::kAllowAnyPort, - network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority); - #if BUILDFLAG(ENABLE_EXTENSIONS) // Allow the pdf viewer extension to access chrome resources blink::WebURL pdfViewerExtension(GURL("chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai")); |