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

components/mus/gles2/command_buffer_driver.cc

 // Copyright 2013 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 "components/mus/gles2/command_buffer_driver.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 72 matching lines @@
   DCHECK(CalledOnValidThread());
   gpu::gles2::ContextCreationAttribHelper attrib_helper;
   if (!attrib_helper.Parse(attribs.storage()))
     return false;
 
   const bool offscreen = widget_ == gfx::kNullAcceleratedWidget;
   if (offscreen) {
     surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size(0, 0));
   } else {
 #if defined(USE_OZONE)
-    scoped_refptr<gfx::GLSurface> underlying_surface =
+    scoped_refptr<gl::GLSurface> underlying_surface =
         gl::init::CreateSurfacelessViewGLSurface(widget_);
     if (!underlying_surface)
       underlying_surface = gl::init::CreateViewGLSurface(widget_);
 #else
-    scoped_refptr<gfx::GLSurface> underlying_surface =
+    scoped_refptr<gl::GLSurface> underlying_surface =
         gl::init::CreateViewGLSurface(widget_);
 #endif
     scoped_refptr<GLSurfaceAdapterMus> surface_adapter =
         new GLSurfaceAdapterMus(underlying_surface);
     surface_adapter->SetGpuCompletedSwapBuffersCallback(
         base::Bind(&CommandBufferDriver::OnGpuCompletedSwapBuffers,
                    weak_factory_.GetWeakPtr()));
     surface_ = surface_adapter;
 
     gfx::VSyncProvider* vsync_provider =
         surface_ ? surface_->GetVSyncProvider() : nullptr;
     if (vsync_provider) {
       vsync_provider->GetVSyncParameters(
           base::Bind(&CommandBufferDriver::OnUpdateVSyncParameters,
                      weak_factory_.GetWeakPtr()));
     }
   }
 
   if (!surface_.get())
     return false;
 
   // TODO(piman): virtual contexts, gpu preference.
-  context_ = gl::init::CreateGLContext(
-      gpu_state_->share_group(), surface_.get(), gfx::PreferIntegratedGpu);
+  context_ = gl::init::CreateGLContext(gpu_state_->share_group(),
+                                       surface_.get(), gl::PreferIntegratedGpu);
   if (!context_.get())
     return false;
 
   if (!context_->MakeCurrent(surface_.get()))
     return false;
 
   // TODO(piman): ShaderTranslatorCache is currently per-ContextGroup but
   // only needs to be per-thread.
   const bool bind_generates_resource = attrib_helper.bind_generates_resource;
   scoped_refptr<gpu::gles2::FeatureInfo> feature_info =
@@ skipping 157 matching lines @@
                                                  gfx::BufferFormat format,
                                                  uint32_t internal_format,
                                                  ui::NativePixmap* pixmap) {
 #if defined(USE_OZONE)
   gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
   if (image_manager->LookupImage(id)) {
     LOG(ERROR) << "Image already exists with same ID.";
     return;
   }
 
-  scoped_refptr<gfx::GLImageOzoneNativePixmap> image =
-      new gfx::GLImageOzoneNativePixmap(size, internal_format);
+  scoped_refptr<gl::GLImageOzoneNativePixmap> image =
+      new gl::GLImageOzoneNativePixmap(size, internal_format);
   if (!image->Initialize(pixmap, format)) {
     NOTREACHED();
     return;
   }
 
   image_manager->AddImage(image.get(), id);
 #endif
 }
 
 void CommandBufferDriver::DestroyImage(int32_t id) {
@@ skipping 229 matching lines @@
 }
 
 void CommandBufferDriver::OnGpuCompletedSwapBuffers(gfx::SwapResult result) {
   DCHECK(CalledOnValidThread());
   if (client_) {
     client_->OnGpuCompletedSwapBuffers(result);
   }
 }
 
 }  // namespace mus