path: root/src/core/web_engine_context.h
diff options
authorAndras Becsi <>2014-05-14 17:53:59 +0200
committerThe Qt Project <>2014-05-15 17:37:10 +0200
commitc0bc770eb1dfcc6689df44438cd396721d5129fc (patch)
treef07b2a56863a40c0cc7916910b7dd5977ad5e118 /src/core/web_engine_context.h
parentc45fc409c14f2e4ccb1aacd0b8af36dbba399666 (diff)
Enable GLContextHelper and register a SurfaceFactoryQt on eAndroid
This is needed to run on certain hardware that needs the shared EGL contexts to be created on the same thread. To prevent a deadlock on eAndroid only use a blocking connection if we are not on the main thread where the singleton was created, since there is a call to this from gpu_info_collector_android before the GPU thread is launched. Change-Id: I6887ad1218b8426097f454741dc5a79ee94f9d62 Reviewed-by: Jocelyn Turcotte <>
Diffstat (limited to 'src/core/web_engine_context.h')
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index e0624afa1..13554066b 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -55,6 +55,7 @@ class ContentMainRunner;
class ContentMainDelegateQt;
+class SurfaceFactoryQt;
class WebEngineContext : public base::RefCounted<WebEngineContext> {
@@ -69,6 +70,9 @@ private:
scoped_ptr<ContentMainDelegateQt> m_mainDelegate;
scoped_ptr<content::ContentMainRunner> m_contentRunner;
scoped_ptr<content::BrowserMainRunner> m_browserRunner;
+#if defined(OS_ANDROID)
+ scoped_ptr<SurfaceFactoryQt> m_surfaceFactory;