diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-15 11:07:50 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-16 09:27:30 +0000 |
| commit | af29cec0a428108274a60fca3738f67cadbaf23b (patch) | |
| tree | 2b9cf987a7ccbbb3baef57f2d6acc15b085d0a2a /src/core/web_engine_context.h | |
| parent | 396ca081d7b0d9dab7de14ebaec7943c3f857a24 (diff) | |
Move thread setup out of the web_engine_context.cpp
This helps avoid conflicts between Qt and Chromium OpenGL
headers.
Change-Id: Ib77d0d985397ef2b9792b26df4bec69bbfbe4611
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/web_engine_context.h')
| -rw-r--r-- | src/core/web_engine_context.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h index 036dc4ccb..cca14194d 100644 --- a/src/core/web_engine_context.h +++ b/src/core/web_engine_context.h @@ -100,10 +100,7 @@ private: WebEngineContext(); ~WebEngineContext(); - static std::unique_ptr<content::GpuThreadController> createGpuThreadController( - const content::InProcessChildThreadParams ¶ms, const gpu::GpuPreferences &gpuPreferences); - static void createGpuProcess( - const content::InProcessChildThreadParams ¶ms, const gpu::GpuPreferences &gpuPreferences); + static void registerMainThreadFactories(bool threaded); static void destroyGpuProcess(); std::unique_ptr<base::RunLoop> m_runLoop; @@ -113,8 +110,6 @@ private: std::unique_ptr<QObject> m_globalQObject; std::unique_ptr<ProfileAdapter> m_defaultProfileAdapter; std::unique_ptr<DevToolsServerQt> m_devtoolsServer; - std::unique_ptr<content::GpuProcess> m_gpuProcess; - bool m_gpuProcessDestroyed = false; QVector<ProfileAdapter*> m_profileAdapters; #if QT_CONFIG(webengine_printing_and_pdf) |