Move code in ui/gl/* from gfx:: to gl::

ui/gl/gl_surface.h

Index: ui/gl/gl_surface.h
diff --git a/ui/gl/gl_surface.h b/ui/gl/gl_surface.h
index 6a2a732408983e8db7dd03143b019893176e85cf..9755e79eff7038945fb3f4e97e266ec846115997 100644
--- a/ui/gl/gl_surface.h
+++ b/ui/gl/gl_surface.h
@@ -20,15 +20,15 @@
 #include "ui/gl/gl_export.h"
 #include "ui/gl/gl_implementation.h"
 
-namespace gl {
-class GLImage;
+namespace gfx {
+class Transform;
+class VSyncProvider;
 }
 
-namespace gfx {
+namespace gl {
 
 class GLContext;
-class Transform;
-class VSyncProvider;
+class GLImage;
 
 // Encapsulates a surface that can be rendered to with GL, hiding platform
 // specific management.
@@ -94,7 +94,7 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
   // FBO. Otherwise returns 0.
   virtual unsigned int GetBackingFrameBufferObject();
 
-  typedef base::Callback<void(SwapResult)> SwapCompletionCallback;
+  typedef base::Callback<void(gfx::SwapResult)> SwapCompletionCallback;
   // Swaps front and back buffers. This has no effect for off-screen
   // contexts. On some platforms, we want to send SwapBufferAck only after the
   // surface is displayed on screen. The callback can be used to delay sending
@@ -156,7 +156,7 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
 
   // Get access to a helper providing time of recent refresh and period
   // of screen refresh. If unavailable, returns NULL.
-  virtual VSyncProvider* GetVSyncProvider();
+  virtual gfx::VSyncProvider* GetVSyncProvider();
 
   // Schedule an overlay plane to be shown at swap time, or on the next
   // CommitOverlayPlanes call.
@@ -170,22 +170,22 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
   // |crop_rect| specifies the region within the buffer to be placed inside
   // |bounds_rect|.
   virtual bool ScheduleOverlayPlane(int z_order,
-                                    OverlayTransform transform,
+                                    gfx::OverlayTransform transform,
                                     gl::GLImage* image,
-                                    const Rect& bounds_rect,
-                                    const RectF& crop_rect);
+                                    const gfx::Rect& bounds_rect,
+                                    const gfx::RectF& crop_rect);
 
   // Schedule a CALayer to be shown at swap time.
   // All arguments correspond to their CALayer properties.
   virtual bool ScheduleCALayer(gl::GLImage* contents_image,
-                               const RectF& contents_rect,
+                               const gfx::RectF& contents_rect,
                                float opacity,
                                unsigned background_color,
                                unsigned edge_aa_mask,
-                               const RectF& rect,
+                               const gfx::RectF& rect,
                                bool is_clipped,
-                               const RectF& clip_rect,
-                               const Transform& transform,
+                               const gfx::RectF& clip_rect,
+                               const gfx::Transform& transform,
                                int sorting_content_id,
                                unsigned filter);
 
@@ -281,12 +281,12 @@ class GL_EXPORT GLSurfaceAdapter : public GLSurface {
   void* GetDisplay() override;
   void* GetConfig() override;
   GLSurface::Format GetFormat() 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 IsSurfaceless() const override;
   bool FlipsVertically() const override;
   bool BuffersFlipped() const override;
@@ -302,6 +302,6 @@ class GL_EXPORT GLSurfaceAdapter : public GLSurface {
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter);
 };
 
-}  // namespace gfx
+}  // namespace gl
 
 #endif  // UI_GL_GL_SURFACE_H_