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

content/gpu/gpu_main.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 <stddef.h>
 #include <stdlib.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 278 matching lines @@
 #endif
     if (command_line.HasSwitch(switches::kInProcessGPU)) {
       // With in-process GPU, gl::init::InitializeGLOneOff() is called from
       // GpuChildThread before getting here.
       gl_already_initialized = true;
     }
 
     // Load and initialize the GL implementation and locate the GL entry points.
     bool gl_initialized =
         gl_already_initialized
-            ? gfx::GetGLImplementation() != gfx::kGLImplementationNone
+            ? gl::GetGLImplementation() != gl::kGLImplementationNone
             : gl::init::InitializeGLOneOff();
     if (gl_initialized) {
       // We need to collect GL strings (VENDOR, RENDERER) for blacklisting
       // purposes. However, on Mac we don't actually use them. As documented in
       // crbug.com/222934, due to some driver issues, glGetString could take
       // multiple seconds to finish, which in turn cause the GPU process to
       // crash.
       // By skipping the following code on Mac, we don't really lose anything,
       // because the basic GPU information is passed down from browser process
       // and we already registered them through SetGpuInfo() above.
@@ skipping 43 matching lines @@
     if (enable_watchdog && delayed_watchdog_enable) {
       watchdog_thread = new GpuWatchdogThread(kGpuTimeout);
       base::Thread::Options options;
       options.timer_slack = base::TIMER_SLACK_MAXIMUM;
       watchdog_thread->StartWithOptions(options);
     }
 
     // OSMesa is expected to run very slowly, so disable the watchdog in that
     // case.
     if (enable_watchdog &&
-        gfx::GetGLImplementation() == gfx::kGLImplementationOSMesaGL) {
+        gl::GetGLImplementation() == gl::kGLImplementationOSMesaGL) {
       watchdog_thread->Stop();
       watchdog_thread = NULL;
     }
 
 #if defined(OS_LINUX)
     should_initialize_gl_context = !initialized_gl_context &&
                                    !dead_on_arrival;
 
     if (!initialized_sandbox) {
       gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(),
@@ skipping 149 matching lines @@
   base::ThreadRestrictions::AssertIOAllowed();
   if (access("/dev/nvidiactl", R_OK) != 0) {
     DVLOG(1) << "NVIDIA device file /dev/nvidiactl access denied";
     res = false;
   }
   return res;
 }
 #endif
 
 void CreateDummyGlContext() {
-  scoped_refptr<gfx::GLSurface> surface(
+  scoped_refptr<gl::GLSurface> surface(
       gl::init::CreateOffscreenGLSurface(gfx::Size()));
   if (!surface.get()) {
     DVLOG(1) << "gl::init::CreateOffscreenGLSurface failed";
     return;
   }
 
   // On Linux, this is needed to make sure /dev/nvidiactl has
   // been opened and its descriptor cached.
-  scoped_refptr<gfx::GLContext> context(
-      gl::init::CreateGLContext(NULL, surface.get(), gfx::PreferDiscreteGpu));
+  scoped_refptr<gl::GLContext> context(
+      gl::init::CreateGLContext(NULL, surface.get(), gl::PreferDiscreteGpu));
   if (!context.get()) {
     DVLOG(1) << "gl::init::CreateGLContext failed";
     return;
   }
 
   // Similarly, this is needed for /dev/nvidia0.
   if (context->MakeCurrent(surface.get())) {
     context->ReleaseCurrent(surface.get());
   } else {
-    DVLOG(1)  << "gfx::GLContext::MakeCurrent failed";
+    DVLOG(1) << "gl::GLContext::MakeCurrent failed";
   }
 }
 
 void WarmUpSandboxNvidia(const gpu::GPUInfo& gpu_info,
                          bool should_initialize_gl_context) {
   // We special case Optimus since the vendor_id we see may not be Nvidia.
   bool uses_nvidia_driver = (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA.
                              gpu_info.driver_vendor == "NVIDIA") ||
                             gpu_info.optimus;
   if (uses_nvidia_driver && should_initialize_gl_context) {
@@ skipping 53 matching lines @@
     return true;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace.
 
 }  // namespace content