| Index: ui/gl/gl_surface_glx.h
|
| diff --git a/ui/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h
|
| index 6cb5f38732c96703d7da484d5e39bdff88d0a59b..d29c62b0587dce86ce31cc85cbcf549ba2eb3736 100644
|
| --- a/ui/gl/gl_surface_glx.h
|
| +++ b/ui/gl/gl_surface_glx.h
|
| @@ -19,7 +19,7 @@
|
| #include "ui/gl/gl_export.h"
|
| #include "ui/gl/gl_surface.h"
|
|
|
| -namespace gfx {
|
| +namespace gl {
|
|
|
| // Base class for GLX surfaces.
|
| class GL_EXPORT GLSurfaceGLX : public GLSurface {
|
| @@ -70,7 +70,7 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX,
|
| bool SupportsPostSubBuffer() override;
|
| void* GetConfig() override;
|
| gfx::SwapResult PostSubBuffer(int x, int y, int width, int height) override;
|
| - VSyncProvider* GetVSyncProvider() override;
|
| + gfx::VSyncProvider* GetVSyncProvider() override;
|
|
|
| protected:
|
| ~NativeViewGLSurfaceGLX() override;
|
| @@ -95,7 +95,7 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX,
|
| GLXFBConfig config_;
|
| gfx::Size size_;
|
|
|
| - std::unique_ptr<VSyncProvider> vsync_provider_;
|
| + std::unique_ptr<gfx::VSyncProvider> vsync_provider_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX);
|
| };
|
| @@ -129,6 +129,6 @@ class GL_EXPORT UnmappedNativeViewGLSurfaceGLX : public GLSurfaceGLX {
|
| DISALLOW_COPY_AND_ASSIGN(UnmappedNativeViewGLSurfaceGLX);
|
| };
|
|
|
| -} // namespace gfx
|
| +} // namespace gl
|
|
|
| #endif // UI_GL_GL_SURFACE_GLX_H_
|
|
|