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

gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc

 // Copyright (c) 2016 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/command_buffer/service/gles2_cmd_decoder_passthrough.h"
 
 #include "base/memory/ref_counted.h"
 #include "gpu/command_buffer/common/debug_marker_manager.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ skipping 85 matching lines @@
     return result;
   }
 
   const char* GetCommandName(unsigned int command_id) const override {
     if (command_id >= kFirstGLES2Command && command_id < kNumCommands) {
       return gles2::GetCommandName(static_cast<CommandId>(command_id));
     }
     return GetCommonCommandName(static_cast<cmd::CommandId>(command_id));
   }
 
-  bool Initialize(const scoped_refptr<gfx::GLSurface>& surface,
-                  const scoped_refptr<gfx::GLContext>& context,
+  bool Initialize(const scoped_refptr<gl::GLSurface>& surface,
+                  const scoped_refptr<gl::GLContext>& context,
                   bool offscreen,
                   const gfx::Size& offscreen_size,
                   const DisallowedFeatures& disallowed_features,
                   const ContextCreationAttribHelper& attrib_helper) override {
     // Take ownership of the context and surface. The surface can be replaced
     // with SetSurface.
     context_ = context;
     surface_ = surface;
 
     if (!group_->Initialize(this, attrib_helper.context_type,
@@ skipping 11 matching lines @@
 
   // Destroys the graphics context.
   void Destroy(bool have_context) override {
     if (image_manager_.get()) {
       image_manager_->Destroy(have_context);
       image_manager_.reset();
     }
   }
 
   // Set the surface associated with the default FBO.
-  void SetSurface(const scoped_refptr<gfx::GLSurface>& surface) override {
+  void SetSurface(const scoped_refptr<gl::GLSurface>& surface) override {
     DCHECK(context_->IsCurrent(nullptr));
     DCHECK(surface_.get());
     surface_ = surface;
   }
 
   // Releases the surface associated with the GL context.
   // The decoder should not be used until a new surface is set.
   void ReleaseSurface() override {
     if (!context_.get())
       return;
@@ skipping 26 matching lines @@
       return false;
     }
 
     return true;
   }
 
   // Gets the GLES2 Util which holds info.
   GLES2Util* GetGLES2Util() override { return nullptr; }
 
   // Gets the associated GLContext.
-  gfx::GLContext* GetGLContext() override { return nullptr; }
+  gl::GLContext* GetGLContext() override { return nullptr; }
 
   // Gets the associated ContextGroup
   ContextGroup* GetContextGroup() override { return nullptr; }
 
   Capabilities GetCapabilities() override {
     DCHECK(initialized());
     Capabilities caps;
     return caps;
   }
 
@@ skipping 155 matching lines @@
     CmdHandler cmd_handler;
     uint8_t arg_flags;   // How to handle the arguments for this scommand
     uint8_t cmd_flags;   // How to handle this command
     uint16_t arg_count;  // How many arguments are expected for this command.
   };
 
   // A table of CommandInfo for all the commands.
   static const CommandInfo command_info[kNumCommands - kFirstGLES2Command];
 
   // The GL context this decoder renders to on behalf of the client.
-  scoped_refptr<gfx::GLSurface> surface_;
-  scoped_refptr<gfx::GLContext> context_;
+  scoped_refptr<gl::GLSurface> surface_;
+  scoped_refptr<gl::GLContext> context_;
 
   // Managers
   std::unique_ptr<ImageManager> image_manager_;
 
   // The ContextGroup for this decoder uses to track resources.
   scoped_refptr<ContextGroup> group_;
   scoped_refptr<FeatureInfo> feature_info_;
 };
 
 const GLES2DecoderPassthroughImpl::CommandInfo
     GLES2DecoderPassthroughImpl::command_info[] = {};
 
 GLES2Decoder* CreateGLES2DecoderPassthroughImpl(ContextGroup* group) {
   return new GLES2DecoderPassthroughImpl(group);
 }
 
 }  // namespace gles2
 }  // namespace gpu