From adb8677717472e020e35084839ab3726920ec386 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 25 Jan 2018 12:49:56 +0100 Subject: Disable shared workers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The feature has been redesigned for security reasons in 64. [ChangeLog][General] SharedWorkers have been disabled as they have been changed in the newest spec for security reasons. Change-Id: I3d0e03f170ef646a0352a38b65030bb4c06f3397 Reviewed-by: Michael Brüning --- src/3rdparty | 2 +- src/core/web_engine_context.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index b7a9c9bf5..2ce39c69e 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit b7a9c9bf5b6bc08ae8746b7679317a9027868681 +Subproject commit 2ce39c69ea6e27d023775ae4efe1401e78d44411 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 6a8c8ae73..fb249c7ff 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -339,6 +339,9 @@ WebEngineContext::WebEngineContext() // Enabled on OS X and Linux but currently not working. It worked in 5.7 on OS X. parsedCommandLine->AppendSwitch(switches::kDisableGpuMemoryBufferVideoFrames); + // Shared workers are not safe until Chromium 64 + parsedCommandLine->AppendSwitch(switches::kDisableSharedWorkers); + #if defined(Q_OS_MACOS) // Accelerated decoding currently does not work on macOS due to issues with OpenGL Rectangle // texture support. See QTBUG-60002. -- cgit v1.2.3 From 41847ecaf3594a12c5120f876be1b330a1ef5486 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 30 Jan 2018 17:51:48 +0100 Subject: Fix quicknanobrowser to use unique storage location Do not use "Default" as custom profile, global profile uses "Default" as storge name, this ends up on creating two browser context adapters using the same files. Change-Id: I298fa87ee14c5c83a15683710ba3fbb29c201714 Reviewed-by: Peter Varga Reviewed-by: Alexandru Croitor --- examples/webengine/quicknanobrowser/ApplicationRoot.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/webengine/quicknanobrowser/ApplicationRoot.qml b/examples/webengine/quicknanobrowser/ApplicationRoot.qml index 78defab80..014b556a1 100644 --- a/examples/webengine/quicknanobrowser/ApplicationRoot.qml +++ b/examples/webengine/quicknanobrowser/ApplicationRoot.qml @@ -55,7 +55,7 @@ QtObject { id: root property QtObject defaultProfile: WebEngineProfile { - storageName: "Default" + storageName: "Profile" } property QtObject otrProfile: WebEngineProfile { -- cgit v1.2.3 From e864d8656c2682fc79a5affe789992de318c8f8a Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 30 Jan 2018 18:05:18 +0100 Subject: Shutdown storage in browser context adapter destructor Shutdown storage should take place in destructor, otherwise it might get recreated on web content destruction. Task-number: QTBUG-66081 Change-Id: Ibba3fce50e05e09131cf45061320a9f99267babd Reviewed-by: Allan Sandfeld Jensen --- src/core/browser_context_adapter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp index 41b5b1932..683b9c0d2 100644 --- a/src/core/browser_context_adapter.cpp +++ b/src/core/browser_context_adapter.cpp @@ -103,11 +103,11 @@ BrowserContextAdapter::BrowserContextAdapter(const QString &storageName) BrowserContextAdapter::~BrowserContextAdapter() { Q_ASSERT(!m_downloadManagerDelegate); + m_browserContext->ShutdownStoragePartitions(); } void BrowserContextAdapter::shutdown() { - m_browserContext->ShutdownStoragePartitions(); if (m_downloadManagerDelegate) { m_browserContext->GetDownloadManager(m_browserContext.data())->Shutdown(); m_downloadManagerDelegate.reset(); -- cgit v1.2.3