Merge remote-tracking branch 'origin/5.14.2' into 5.15

Conflicts:
	src/3rdparty
	src/core/web_engine_context.cpp

Change-Id: Ib02d0e50124917b1b09e528e5ec8570c25a94051

1 files changed, 1 insertions, 17 deletions

diff --git a/src/core/web_engine_context_threads.cpp b/src/core/web_engine_context_threads.cpp
index 9eb272e87..ba3e18499 100644
--- a/src/core/web_engine_context_threads.cpp
+++ b/src/core/web_engine_context_threads.cpp
@@ -92,20 +92,6 @@ struct GpuThreadControllerQt : content::GpuThreadController
         s_gpuProcess->set_main_thread(childThread);
     }
 
-    static void cleanupVizProcess()
-    {
-        auto gpuChildThread = content::GpuChildThread::instance();
-        if (!gpuChildThread)
-            return;
-        auto vizMain = gpuChildThread->viz_main();
-        auto vizCompositorThreadRunner = vizMain->viz_compositor_thread_runner();
-        if (!vizCompositorThreadRunner)
-            return;
-        QEventLoop loop;
-        vizCompositorThreadRunner->CleanupForShutdown(base::BindOnce(&QEventLoop::quit, base::Unretained(&loop)));
-        loop.exec();
-    }
-
     static void destroyGpuProcess()
     {
         DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -133,10 +119,8 @@ static std::unique_ptr<content::GpuThreadController> createGpuThreadController(
 }
 
 // static
-void WebEngineContext::destroyGpuProcess(bool threaded)
+void WebEngineContext::destroyGpuProcess()
 {
-    if (!threaded)
-        GpuThreadControllerQt::cleanupVizProcess();
     GpuThreadControllerQt::destroyGpuProcess();
 }