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

ui/gl/gl_surface.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_surface.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gfx/swap_result.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 
-namespace gfx {
+namespace gl {
 
 namespace {
 base::LazyInstance<base::ThreadLocalPointer<GLSurface> >::Leaky
     current_surface_ = LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
 // static
 bool GLSurface::InitializeOneOff() {
   DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
 
@@ skipping 154 matching lines @@
 void* GLSurface::GetConfig() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 GLSurface::Format GLSurface::GetFormat() {
   NOTIMPLEMENTED();
   return SURFACE_DEFAULT;
 }
 
-VSyncProvider* GLSurface::GetVSyncProvider() {
+gfx::VSyncProvider* GLSurface::GetVSyncProvider() {
   return NULL;
 }
 
 bool GLSurface::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) {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool GLSurface::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) {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool GLSurface::IsSurfaceless() const {
   return false;
 }
 
@@ skipping 141 matching lines @@
 }
 
 void* GLSurfaceAdapter::GetConfig() {
   return surface_->GetConfig();
 }
 
 GLSurface::Format GLSurfaceAdapter::GetFormat() {
   return surface_->GetFormat();
 }
 
-VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() {
+gfx::VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() {
   return surface_->GetVSyncProvider();
 }
 
 bool GLSurfaceAdapter::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) {
   return surface_->ScheduleOverlayPlane(
       z_order, transform, image, bounds_rect, crop_rect);
 }
 
 bool GLSurfaceAdapter::IsSurfaceless() const {
   return surface_->IsSurfaceless();
 }
 
 bool GLSurfaceAdapter::FlipsVertically() const {
   return surface_->FlipsVertically();
 }
 
 bool GLSurfaceAdapter::BuffersFlipped() const {
   return surface_->BuffersFlipped();
 }
 
 GLSurfaceAdapter::~GLSurfaceAdapter() {}
 
-}  // namespace gfx
+}  // namespace gl