diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-10-21 14:59:04 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-11-16 16:46:55 +0000 |
| commit | 89bb3c97eee9cd4bf9fb536f024715e606e49ae0 (patch) | |
| tree | ac9f15c108582a411a59d899323892b0c165cfd8 /src/core/web_engine_context.cpp | |
| parent | 05560ed24561535e264995dc3c09d4ae4873f95c (diff) | |
Do not access accessibility from qt post routines
It seems accessing accessibility from qt post routines ends
badly since caches are gone already.
Add closingDown() function to web context, which is similar to
QCoreApplication::closingDown(), however return true on
post routine.
Guard delete accessibility calls.
Note the widget part is not necessary, but added for completeness,
since only qml can release profiles due to garbage collection.
Fixes: QTBUG-90904
Pick-to: 6.2 6.2.2 5.15
Change-Id: Ic0e7115cd17eb58f3d58f70fefbc197dfb7a6493
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index d11298b06..41aed57e2 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -384,7 +384,7 @@ static QStringList parseEnvCommandLine(const QString &cmdLine) scoped_refptr<QtWebEngineCore::WebEngineContext> WebEngineContext::m_handle; bool WebEngineContext::m_destroyed = false; - +bool WebEngineContext::m_closingDown = false; void WebEngineContext::destroyProfileAdapter() { if (content::RenderProcessHost::run_renderer_in_process()) { @@ -553,6 +553,7 @@ void WebEngineContext::destroyContextPostRoutine() // Destroy WebEngineContext before its static pointer is zeroed and destructor called. // Before destroying MessageLoop via destroying BrowserMainRunner destructor // WebEngineContext's pointer is used. + m_closingDown = true; m_handle->destroy(); #if !defined(NDEBUG) if (!m_handle->HasOneRef()) @@ -919,6 +920,11 @@ base::CommandLine* WebEngineContext::commandLine() { } } +bool WebEngineContext::closingDown() +{ + return m_closingDown; +} + } // namespace QT_BEGIN_NAMESPACE @@ -959,4 +965,5 @@ const char *qWebEngineChromiumSecurityPatchVersion() noexcept { return "92.0.4515.166"; // FIXME: Remember to update } + QT_END_NAMESPACE |