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

gpu/ipc/service/gpu_channel_manager.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 "gpu/ipc/service/gpu_channel_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 40 matching lines @@
     base::WaitableEvent* shutdown_event,
     SyncPointManager* sync_point_manager,
     GpuMemoryBufferFactory* gpu_memory_buffer_factory)
     : task_runner_(task_runner),
       io_task_runner_(io_task_runner),
       gpu_preferences_(gpu_preferences),
       gpu_driver_bug_workarounds_(base::CommandLine::ForCurrentProcess()),
       delegate_(delegate),
       watchdog_(watchdog),
       shutdown_event_(shutdown_event),
-      share_group_(new gfx::GLShareGroup),
+      share_group_(new gl::GLShareGroup),
       mailbox_manager_(gles2::MailboxManager::Create(gpu_preferences)),
       gpu_memory_manager_(this),
       sync_point_manager_(sync_point_manager),
       sync_point_client_waiter_(
           sync_point_manager->CreateSyncPointClientWaiter()),
       gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
       exiting_for_lost_context_(false),
       weak_factory_(this) {
   DCHECK(task_runner);
   DCHECK(io_task_runner);
   if (gpu_preferences_.ui_prioritize_in_gpu_process)
     preemption_flag_ = new PreemptionFlag;
 }
 
 GpuChannelManager::~GpuChannelManager() {
   // Destroy channels before anything else because of dependencies.
   gpu_channels_.clear();
   if (default_offscreen_surface_.get()) {
     default_offscreen_surface_->Destroy();
     default_offscreen_surface_ = NULL;
   }
 }
 
 gles2::ProgramCache* GpuChannelManager::program_cache() {
   if (!program_cache_.get() &&
-      (gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary ||
-       gfx::g_driver_gl.ext.b_GL_OES_get_program_binary) &&
+      (gl::g_driver_gl.ext.b_GL_ARB_get_program_binary ||
+       gl::g_driver_gl.ext.b_GL_OES_get_program_binary) &&
       !gpu_preferences_.disable_gpu_program_cache) {
     program_cache_.reset(new gles2::MemoryProgramCache(
           gpu_preferences_.gpu_program_cache_size,
           gpu_preferences_.disable_gpu_shader_disk_cache));
   }
   return program_cache_.get();
 }
 
 gles2::ShaderTranslatorCache*
 GpuChannelManager::shader_translator_cache() {
@@ skipping 126 matching lines @@
     // gracefully.
     base::MessageLoop::current()->QuitNow();
     exiting_for_lost_context_ = true;
   }
 }
 
 void GpuChannelManager::DestroyAllChannels() {
   gpu_channels_.clear();
 }
 
-gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
+gl::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
   if (!default_offscreen_surface_.get()) {
     default_offscreen_surface_ =
         gl::init::CreateOffscreenGLSurface(gfx::Size());
   }
   return default_offscreen_surface_.get();
 }
 
 #if defined(OS_ANDROID)
 void GpuChannelManager::DidAccessGpu() {
   last_gpu_access_time_ = base::TimeTicks::Now();
@@ skipping 35 matching lines @@
     }
   }
   if (!stub || !stub->decoder()->MakeCurrent())
     return;
   glFinish();
   DidAccessGpu();
 }
 #endif
 
 }  // namespace gpu