diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-02 14:48:25 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-01 16:56:06 +0000 |
commit | 4d61ba751088f650fe5d22bbf88036e80ff19f0f (patch) | |
tree | a1583bd501cfd675655396775108a9b7b3881b95 /src/core/gl_surface_qt.cpp | |
parent | 06a60e33c6101d725d8b88d4e3c647b9b2d3e7ab (diff) |
Basic porting to Chromium 51
Trivial changes in methods, arguments and types.
Change-Id: Ic707c376249f816268223e696ed5f6251df1f85f
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/gl_surface_qt.cpp')
-rw-r--r-- | src/core/gl_surface_qt.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index 8283e4cc4..ef5b1d172 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -51,7 +51,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "content/common/gpu/image_transport_surface.h" +#include "gpu/ipc/service/image_transport_surface.h" #include "ui/gl/egl_util.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_implementation.h" @@ -289,7 +289,7 @@ bool GLSurfaceQtWGL::Initialize() { m_surfaceBuffer = new PbufferGLSurfaceWGL(m_size); - return m_surfaceBuffer->Initialize(); + return m_surfaceBuffer->Initialize(gfx::GLSurface::SURFACE_DEFAULT); } void GLSurfaceQtWGL::Destroy() @@ -557,10 +557,11 @@ std::string DriverEGL::GetPlatformExtensions() } // namespace gfx -namespace content { +namespace gpu { class GpuCommandBufferStub; class GpuChannelManager; -scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(GpuChannelManager*, GpuCommandBufferStub*, const gfx::GLSurfaceHandle&) +scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(GpuChannelManager*, GpuCommandBufferStub*, + SurfaceHandle, gfx::GLSurface::Format) { QT_NOT_USED return scoped_refptr<gfx::GLSurface>(); |