Index: components/mus/gles2/gl_surface_adapter.h |
diff --git a/components/mus/gles2/gl_surface_adapter.h b/components/mus/gles2/gl_surface_adapter.h |
index df7d10e6509f92c74220d826ec663b157a42225c..98da753091536e7fd8c3402342b7a5cfed35a685 100644 |
--- a/components/mus/gles2/gl_surface_adapter.h |
+++ b/components/mus/gles2/gl_surface_adapter.h |
@@ -17,49 +17,49 @@ |
namespace mus { |
// Wraps a GLSurface such that there is a real GLSurface instance acting as |
-// delegate. Implements the GLSurface interface. The |gfx::GLSurfaceAdapter| |
+// delegate. Implements the GLSurface interface. The |gl::GLSurfaceAdapter| |
// superclass provides a default implementation that forwards all GLSurface |
// methods to the provided delegate. |GLSurfaceAdapterMus| overrides only the |
// necessary methods to augment the completion callback argument to |
// |SwapBuffersAsync|, |PostSubBufferAsync| and |CommitOverlayPlanesAsync| with |
// a callback provided with the |SetGpuCompletedSwapBuffersCallback| method. |
-class GLSurfaceAdapterMus : public gfx::GLSurfaceAdapter { |
+class GLSurfaceAdapterMus : public gl::GLSurfaceAdapter { |
public: |
// Creates a new |GLSurfaceAdapterMus| that delegates to |surface|. |
- explicit GLSurfaceAdapterMus(scoped_refptr<gfx::GLSurface> surface); |
+ explicit GLSurfaceAdapterMus(scoped_refptr<gl::GLSurface> surface); |
- // gfx::GLSurfaceAdapter. |
+ // gl::GLSurfaceAdapter. |
void SwapBuffersAsync( |
- const gfx::GLSurface::SwapCompletionCallback& callback) override; |
+ const gl::GLSurface::SwapCompletionCallback& callback) override; |
void PostSubBufferAsync( |
int x, |
int y, |
int width, |
int height, |
- const gfx::GLSurface::SwapCompletionCallback& callback) override; |
+ const gl::GLSurface::SwapCompletionCallback& callback) override; |
void CommitOverlayPlanesAsync( |
- const gfx::GLSurface::SwapCompletionCallback& callback) override; |
+ const gl::GLSurface::SwapCompletionCallback& callback) override; |
// Set an additional callback to run on SwapBuffers completion. |
void SetGpuCompletedSwapBuffersCallback( |
- gfx::GLSurface::SwapCompletionCallback callback); |
+ gl::GLSurface::SwapCompletionCallback callback); |
private: |
~GLSurfaceAdapterMus() override; |
- // We wrap the callback given to the |gfx::GLSurfaceAdapter| overrides above |
+ // We wrap the callback given to the |gl::GLSurfaceAdapter| overrides above |
// with an invocation of this function. It invokes |adapter_callback_| and the |
// original |original_callback| provided by the original invoker of |
// |SwapBuffersAsync| etc. |
void WrappedCallbackForSwapBuffersAsync( |
- const gfx::GLSurface::SwapCompletionCallback& original_callback, |
+ const gl::GLSurface::SwapCompletionCallback& original_callback, |
gfx::SwapResult result); |
- gfx::GLSurface::SwapCompletionCallback adapter_callback_; |
+ gl::GLSurface::SwapCompletionCallback adapter_callback_; |
- // gfx::GLSurfaceAdapter doesn't own the delegate surface so keep a reference |
+ // gl::GLSurfaceAdapter doesn't own the delegate surface so keep a reference |
// here. |
- scoped_refptr<gfx::GLSurface> surface_; |
+ scoped_refptr<gl::GLSurface> surface_; |
base::WeakPtrFactory<GLSurfaceAdapterMus> weak_ptr_factory_; |