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

Unified Diff: components/mus/gles2/gl_surface_adapter.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/gl_surface_adapter.h ('k') | components/mus/gles2/gpu_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/gles2/gl_surface_adapter.cc
diff --git a/components/mus/gles2/gl_surface_adapter.cc b/components/mus/gles2/gl_surface_adapter.cc
index 827028821b29e329792cdf3c31b5f01827857521..df1761b5854ee3c0e775332031dd2b634a118224 100644
--- a/components/mus/gles2/gl_surface_adapter.cc
+++ b/components/mus/gles2/gl_surface_adapter.cc
@@ -8,8 +8,8 @@
namespace mus {
-GLSurfaceAdapterMus::GLSurfaceAdapterMus(scoped_refptr<gfx::GLSurface> surface)
- : gfx::GLSurfaceAdapter(surface.get()),
+GLSurfaceAdapterMus::GLSurfaceAdapterMus(scoped_refptr<gl::GLSurface> surface)
+ : gl::GLSurfaceAdapter(surface.get()),
surface_(surface),
weak_ptr_factory_(this) {}
@@ -17,7 +17,7 @@ GLSurfaceAdapterMus::~GLSurfaceAdapterMus() {}
void GLSurfaceAdapterMus::SwapBuffersAsync(
const GLSurface::SwapCompletionCallback& callback) {
- gfx::GLSurfaceAdapter::SwapBuffersAsync(
+ gl::GLSurfaceAdapter::SwapBuffersAsync(
base::Bind(&GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync,
weak_ptr_factory_.GetWeakPtr(), callback));
}
@@ -28,7 +28,7 @@ void GLSurfaceAdapterMus::PostSubBufferAsync(
int width,
int height,
const GLSurface::SwapCompletionCallback& callback) {
- gfx::GLSurfaceAdapter::PostSubBufferAsync(
+ gl::GLSurfaceAdapter::PostSubBufferAsync(
x, y, width, height,
base::Bind(&GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync,
weak_ptr_factory_.GetWeakPtr(), callback));
@@ -36,13 +36,13 @@ void GLSurfaceAdapterMus::PostSubBufferAsync(
void GLSurfaceAdapterMus::CommitOverlayPlanesAsync(
const GLSurface::SwapCompletionCallback& callback) {
- gfx::GLSurfaceAdapter::CommitOverlayPlanesAsync(
+ gl::GLSurfaceAdapter::CommitOverlayPlanesAsync(
base::Bind(&GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync,
weak_ptr_factory_.GetWeakPtr(), callback));
}
void GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync(
- const gfx::GLSurface::SwapCompletionCallback& original_callback,
+ const gl::GLSurface::SwapCompletionCallback& original_callback,
gfx::SwapResult result) {
if (!adapter_callback_.is_null())
adapter_callback_.Run(result);
@@ -50,7 +50,7 @@ void GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync(
}
void GLSurfaceAdapterMus::SetGpuCompletedSwapBuffersCallback(
- gfx::GLSurface::SwapCompletionCallback callback) {
+ gl::GLSurface::SwapCompletionCallback callback) {
adapter_callback_ = std::move(callback);
}
« no previous file with comments | « components/mus/gles2/gl_surface_adapter.h ('k') | components/mus/gles2/gpu_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698