diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-09 16:43:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-01 12:06:23 +0000 |
| commit | b1ba710d5745e57a4ed88bea799b819817d04b8b (patch) | |
| tree | 092f6b9e10276e8a56cab79a98ea402ad86c7168 /src/core/web_engine_context.cpp | |
| parent | ab94349cb2fa073e8aec661a797de1cfc3819752 (diff) | |
Adapt devtools to Chromium 55
A restructuring of all our devtools integration classes.
Change-Id: I2a32b9b2e66c17b72aaa3bbf246a22d211409aa5
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index b88f6308f..b4788e02d 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -51,7 +51,7 @@ #if defined(ENABLE_BASIC_PRINTING) #include "chrome/browser/printing/print_job_manager.h" #endif // defined(ENABLE_BASIC_PRINTING) -#include "components/devtools_http_handler/devtools_http_handler.h" +#include "content/browser/devtools/devtools_http_handler.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/utility_process_host_impl.h" @@ -183,13 +183,15 @@ void WebEngineContext::destroyBrowserContext() void WebEngineContext::destroy() { + if (m_devtoolsServer) + m_devtoolsServer->stop(); delete m_globalQObject; m_globalQObject = 0; base::MessagePump::Delegate *delegate = m_runLoop->loop_; // Flush the UI message loop before quitting. while (delegate->DoWork()) { } GLContextHelper::destroy(); - m_devtools.reset(0); + m_devtoolsServer.reset(0); m_runLoop->AfterRun(); // Force to destroy RenderProcessHostImpl by destroying BrowserMainRunner. @@ -205,7 +207,7 @@ WebEngineContext::~WebEngineContext() { // WebEngineContext::destroy() must be called before we are deleted Q_ASSERT(!m_globalQObject); - Q_ASSERT(!m_devtools); + Q_ASSERT(!m_devtoolsServer); Q_ASSERT(!m_browserRunner); } @@ -404,7 +406,8 @@ WebEngineContext::WebEngineContext() m_runLoop.reset(new base::RunLoop); m_runLoop->BeforeRun(); - m_devtools = createDevToolsHttpHandler(); + m_devtoolsServer.reset(new DevToolsServerQt()); + m_devtoolsServer->start(); // Force the initialization of MediaCaptureDevicesDispatcher on the UI // thread to avoid a thread check assertion in its constructor when it // first gets referenced on the IO thread. |