From f1e2b2d80366b43ba638290bca55272b000b3ce1 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 1 Aug 2016 16:19:34 +0200 Subject: Adaptations to Chromium 53 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959 Reviewed-by: Michael Brüning --- src/core/gl_context_qt.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/core/gl_context_qt.cpp') diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp index 0cf873631..bbcd3554d 100644 --- a/src/core/gl_context_qt.cpp +++ b/src/core/gl_context_qt.cpp @@ -89,19 +89,19 @@ void GLContextHelper::destroy() contextHelper = 0; } -bool GLContextHelper::initializeContextOnBrowserThread(gfx::GLContext* context, gfx::GLSurface* surface) +bool GLContextHelper::initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface) { - return context->Initialize(surface, gfx::PreferDiscreteGpu); + return context->Initialize(surface, gl::PreferDiscreteGpu); } -bool GLContextHelper::initializeContext(gfx::GLContext* context, gfx::GLSurface* surface) +bool GLContextHelper::initializeContext(gl::GLContext* context, gl::GLSurface* surface) { bool ret = false; Qt::ConnectionType connType = (QThread::currentThread() == qApp->thread()) ? Qt::DirectConnection : Qt::BlockingQueuedConnection; QMetaObject::invokeMethod(contextHelper, "initializeContextOnBrowserThread", connType, Q_RETURN_ARG(bool, ret), - Q_ARG(gfx::GLContext*, context), - Q_ARG(gfx::GLSurface*, surface)); + Q_ARG(gl::GLContext*, context), + Q_ARG(gl::GLSurface*, surface)); return ret; } @@ -143,9 +143,11 @@ QT_END_NAMESPACE #if defined(USE_OZONE) || defined(OS_WIN) -namespace gfx { +namespace gl { -scoped_refptr GLContext::CreateGLContext(GLShareGroup* share_group, GLSurface* compatible_surface, GpuPreference gpu_preference) +namespace init { + +scoped_refptr CreateGLContext(GLShareGroup* share_group, GLSurface* compatible_surface, GpuPreference gpu_preference) { #if defined(OS_WIN) scoped_refptr context; @@ -167,6 +169,8 @@ scoped_refptr GLContext::CreateGLContext(GLShareGroup* share_group, G return context; } -} // namespace gfx +} // namespace init + +} // namespace gl #endif // defined(USE_OZONE) || defined(OS_WIN) -- cgit v1.2.3