summaryrefslogtreecommitdiffstats
path: root/src/core/gl_surface_qt.cpp
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-07-28 17:29:14 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-14 16:43:32 +0200
commitb1d423a3fc2cb3eeacc2a3e91ac9bdd2211c2613 (patch)
tree53f39e4e7c6a76d19a92fc23fde0728e6df95fc7 /src/core/gl_surface_qt.cpp
parentf987b713b9f4e363056bf5174a762acb5b77ed79 (diff)
Update the QtWebEngineCore library to run on top of Chromium 37
Most of the patch is about upstream classes/methods that changed. Other important details: - icu data files are now used by default - cygwin is no longer required to build on Windows - RenderFrameHost has been replacing RenderViewHost in a few places, following the separate process iframes support in Chromium - The user agent is accessed through ContentClient::GetUserAgent instead of from the command line switches Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/gl_surface_qt.cpp')
-rw-r--r--src/core/gl_surface_qt.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index a338fe5cd..20f235048 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -314,6 +314,10 @@ bool GLSurfaceEGL::IsCreateContextRobustnessSupported()
GLSurfaceQt::GLSurfaceQt(const gfx::Size& size)
: m_size(size)
{
+ // Some implementations of Pbuffer do not support having a 0 size. For such
+ // cases use a (1, 1) surface.
+ if (m_size.GetArea() == 0)
+ m_size.SetSize(1, 1);
}
bool GLSurfaceQt::HasEGLExtension(const char* name)
@@ -337,12 +341,6 @@ bool GLSurfaceQtEGL::Initialize()
return false;
}
- if (m_size.GetArea() == 0) {
- LOG(ERROR) << "Error: surface has zero area"
- << m_size.width() << " x " << m_size.height();
- return false;
- }
-
const EGLint pbuffer_attributes[] = {
EGL_WIDTH, m_size.width(),
EGL_HEIGHT, m_size.height(),