Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: components/mus/gles2/command_buffer_driver.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/mus/gles2/command_buffer_driver.h ('k') | components/mus/gles2/command_buffer_local.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/gles2/command_buffer_driver.cc
diff --git a/components/mus/gles2/command_buffer_driver.cc b/components/mus/gles2/command_buffer_driver.cc
index ec8bf835ffd09df8a9b501ad334cb2ce438ed22e..798bb564f80bd52822834114aa8ed97f8b10647c 100644
--- a/components/mus/gles2/command_buffer_driver.cc
+++ b/components/mus/gles2/command_buffer_driver.cc
@@ -90,12 +90,12 @@ bool CommandBufferDriver::Initialize(
surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size(0, 0));
} else {
#if defined(USE_OZONE)
- scoped_refptr<gfx::GLSurface> underlying_surface =
+ scoped_refptr<gl::GLSurface> underlying_surface =
gl::init::CreateSurfacelessViewGLSurface(widget_);
if (!underlying_surface)
underlying_surface = gl::init::CreateViewGLSurface(widget_);
#else
- scoped_refptr<gfx::GLSurface> underlying_surface =
+ scoped_refptr<gl::GLSurface> underlying_surface =
gl::init::CreateViewGLSurface(widget_);
#endif
scoped_refptr<GLSurfaceAdapterMus> surface_adapter =
@@ -118,8 +118,8 @@ bool CommandBufferDriver::Initialize(
return false;
// TODO(piman): virtual contexts, gpu preference.
- context_ = gl::init::CreateGLContext(
- gpu_state_->share_group(), surface_.get(), gfx::PreferIntegratedGpu);
+ context_ = gl::init::CreateGLContext(gpu_state_->share_group(),
+ surface_.get(), gl::PreferIntegratedGpu);
if (!context_.get())
return false;
@@ -297,8 +297,8 @@ void CommandBufferDriver::CreateImageNativeOzone(int32_t id,
return;
}
- scoped_refptr<gfx::GLImageOzoneNativePixmap> image =
- new gfx::GLImageOzoneNativePixmap(size, internal_format);
+ scoped_refptr<gl::GLImageOzoneNativePixmap> image =
+ new gl::GLImageOzoneNativePixmap(size, internal_format);
if (!image->Initialize(pixmap, format)) {
NOTREACHED();
return;
« no previous file with comments | « components/mus/gles2/command_buffer_driver.h ('k') | components/mus/gles2/command_buffer_local.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698