Position overlays in AVDACodecImage

media/gpu/avda_surface_bundle.h

 // Copyright 2017 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.
 
 #ifndef MEDIA_GPU_AVDA_SURFACE_BUNDLE_H_
 #define MEDIA_GPU_AVDA_SURFACE_BUNDLE_H_
 
 #include "base/memory/ref_counted.h"
 #include "media/base/android/android_overlay.h"
 #include "media/base/surface_manager.h"
 #include "media/gpu/media_gpu_export.h"
+#include "media/gpu/surface_texture_gl_owner.h"
 #include "ui/gl/android/scoped_java_surface.h"
-#include "ui/gl/android/surface_texture.h"
 
 namespace media {
 
 // AVDASurfaceBundle is a collection of everything that the producer-side of
 // the output surface needs.  In other words, it's the surface, and any
 // SurfaceTexture that backs it.  The SurfaceTexture isn't needed directly by
 // the producer, but destroying it causes the surface not to work.
 //
 // The idea is that a reference to this should be kept with the codec, even if
 // the codec is sent to another thread.  This will prevent the output surface
@@ skipping 16 matching lines @@
       return overlay->GetJavaSurface();
     else
       return surface_texture_surface.j_surface();
   }
 
   // If |overlay| is non-null, then |overlay| owns j_surface().
   std::unique_ptr<AndroidOverlay> overlay;
 
   // The SurfaceTexture attached to |surface()|, or nullptr if j_surface() is
   // SurfaceView backed.
-  scoped_refptr<gl::SurfaceTexture> surface_texture;
+  scoped_refptr<SurfaceTextureGLOwner> surface_texture;
 
   // If |surface_texture| is not null, then this is the surface for it.
   gl::ScopedJavaSurface surface_texture_surface;
 
  private:
   ~AVDASurfaceBundle();
   friend class base::RefCountedThreadSafe<AVDASurfaceBundle>;
 
   DISALLOW_COPY_AND_ASSIGN(AVDASurfaceBundle);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_AVDA_SURFACE_BUNDLE_H_