Index: ui/gl/gl_surface_egl.h |
diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h |
index 4be8b2a5a2f4006f90644f7994ca4f9ae7484e34..10434d006932826655f516ff8401c8595ca0ba7e 100644 |
--- a/ui/gl/gl_surface_egl.h |
+++ b/ui/gl/gl_surface_egl.h |
@@ -24,7 +24,7 @@ |
#include "ui/gl/gl_surface.h" |
#include "ui/gl/gl_surface_overlay.h" |
-namespace gfx { |
+namespace gl { |
// Get default EGL display for GLSurfaceEGL (differs by platform). |
EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay(); |
@@ -102,18 +102,19 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL { |
gfx::SwapResult PostSubBuffer(int x, int y, int width, int height) override; |
bool SupportsCommitOverlayPlanes() override; |
gfx::SwapResult CommitOverlayPlanes() override; |
- VSyncProvider* GetVSyncProvider() override; |
+ gfx::VSyncProvider* GetVSyncProvider() override; |
bool ScheduleOverlayPlane(int z_order, |
- OverlayTransform transform, |
+ gfx::OverlayTransform transform, |
gl::GLImage* image, |
- const Rect& bounds_rect, |
- const RectF& crop_rect) override; |
+ const gfx::Rect& bounds_rect, |
+ const gfx::RectF& crop_rect) override; |
bool FlipsVertically() const override; |
bool BuffersFlipped() const override; |
- // Create a NativeViewGLSurfaceEGL with an externally provided VSyncProvider. |
- // Takes ownership of the VSyncProvider. |
- virtual bool Initialize(std::unique_ptr<VSyncProvider> sync_provider); |
+ // Create a NativeViewGLSurfaceEGL with an externally provided |
+ // gfx::VSyncProvider. |
+ // Takes ownership of the gfx::VSyncProvider. |
+ virtual bool Initialize(std::unique_ptr<gfx::VSyncProvider> sync_provider); |
// Takes care of the platform dependant bits, of any, for creating the window. |
virtual bool InitializeNativeWindow(); |
@@ -136,7 +137,7 @@ class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL { |
bool supports_post_sub_buffer_; |
bool flips_vertically_; |
- std::unique_ptr<VSyncProvider> vsync_provider_; |
+ std::unique_ptr<gfx::VSyncProvider> vsync_provider_; |
int swap_interval_; |
@@ -211,6 +212,6 @@ class GL_EXPORT SurfacelessEGL : public GLSurfaceEGL { |
DISALLOW_COPY_AND_ASSIGN(SurfacelessEGL); |
}; |
-} // namespace gfx |
+} // namespace gl |
#endif // UI_GL_GL_SURFACE_EGL_H_ |