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

media/gpu/android_copying_backing_strategy.cc

 // Copyright 2015 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 "media/gpu/android_copying_backing_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "media/base/limits.h"
 #include "media/gpu/avda_return_on_failure.h"
 #include "media/video/picture.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace media {
 
 AndroidCopyingBackingStrategy::AndroidCopyingBackingStrategy(
     AVDAStateProvider* state_provider)
     : state_provider_(state_provider),
       surface_texture_id_(0),
       media_codec_(nullptr) {}
 
 AndroidCopyingBackingStrategy::~AndroidCopyingBackingStrategy() {}
 
-gfx::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize(
+gl::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize(
     int surface_view_id) {
   if (surface_view_id != media::VideoDecodeAccelerator::Config::kNoSurfaceID) {
     LOG(ERROR) << "The copying strategy should not be initialized with a "
                   "surface id.";
-    return gfx::ScopedJavaSurface();
+    return gl::ScopedJavaSurface();
   }
 
   // Create a texture and attach the SurfaceTexture to it.
   glGenTextures(1, &surface_texture_id_);
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_EXTERNAL_OES, surface_texture_id_);
 
   // Note that the target will be correctly sized, so nearest filtering is all
   // that's needed.
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
   state_provider_->GetGlDecoder()->RestoreTextureUnitBindings(0);
   state_provider_->GetGlDecoder()->RestoreActiveTexture();
 
-  surface_texture_ = gfx::SurfaceTexture::Create(surface_texture_id_);
+  surface_texture_ = gl::SurfaceTexture::Create(surface_texture_id_);
 
-  return gfx::ScopedJavaSurface(surface_texture_.get());
+  return gl::ScopedJavaSurface(surface_texture_.get());
 }
 
 void AndroidCopyingBackingStrategy::Cleanup(
     bool have_context,
     const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) {
   DCHECK(state_provider_->ThreadChecker().CalledOnValidThread());
 
   if (copier_)
     copier_->Destroy();
 
   if (surface_texture_id_ && have_context)
     glDeleteTextures(1, &surface_texture_id_);
 }
 
-scoped_refptr<gfx::SurfaceTexture>
+scoped_refptr<gl::SurfaceTexture>
 AndroidCopyingBackingStrategy::GetSurfaceTexture() const {
   return surface_texture_;
 }
 
 uint32_t AndroidCopyingBackingStrategy::GetTextureTarget() const {
   return GL_TEXTURE_2D;
 }
 
 gfx::Size AndroidCopyingBackingStrategy::GetPictureBufferSize() const {
   return state_provider_->GetSize();
@@ skipping 104 matching lines @@
   RETURN_IF_NULL(texture_ref);
   gpu::gles2::TextureManager* texture_manager =
       state_provider_->GetGlDecoder()->GetContextGroup()->texture_manager();
   RETURN_IF_NULL(texture_manager);
   texture_manager->SetLevelInfo(texture_ref, GetTextureTarget(), 0, GL_RGBA,
                                 new_size.width(), new_size.height(), 1, 0,
                                 GL_RGBA, GL_UNSIGNED_BYTE, gfx::Rect(new_size));
 }
 
 }  // namespace media