summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-06-16 14:42:15 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-06-16 14:52:08 +0200
commit8159f0b7baee0d52d7c743c6b96f36d1fb61cdac (patch)
tree8486035ab0c5a22bee0aa662e7281c5a53c65f27 /src
parent68938757289cc8ab8a36697fe0f12bc5980eaefa (diff)
Explicitly return false in WasAllocatedUsingRobustnessExtension
This is the default behavior of gfx::GLContext, but explicitly do it for documentation purpose and cover the case of the behavior of gfx::GLContext would change in the future. This also updates the submodule to include the change that uses this value. Change-Id: I214376d92b4f9f11bd491c2b1263cf8159e5779f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
m---------src/3rdparty0
-rw-r--r--src/core/content_browser_client_qt.cpp2
2 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 91bc2da61f6ea5617bf0161f65a9b36de93783f
+Subproject 1f3cc8c2618979b557d60ef1ad984a49dca83bf
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 857d9eef9..c70b2993e 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -235,6 +235,8 @@ public:
}
virtual void* GetHandle() Q_DECL_OVERRIDE { return m_handle; }
+ // Qt currently never creates contexts using robustness attributes.
+ virtual bool WasAllocatedUsingRobustnessExtension() { return false; }
// We don't care about the rest, this context shouldn't be used except for its handle.
virtual bool Initialize(gfx::GLSurface *, gfx::GpuPreference) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; }