Relocate SurfaceTexture usage from AVDA GLImage into shared state.

media/gpu/avda_picture_buffer_manager.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/avda_picture_buffer_manager.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include "base/android/build_info.h"
@@ skipping 273 matching lines @@
   MaybeRenderEarly();
 }
 
 void AVDAPictureBufferManager::AssignOnePictureBuffer(
     const PictureBuffer& picture_buffer,
     bool have_context) {
   // Attach a GLImage to each texture that will use the surface texture.
   // We use a refptr here in case SetImageForPicture fails.
   scoped_refptr<gpu::gles2::GLStreamTextureImage> gl_image =
       new AVDACodecImage(picture_buffer.id(), shared_state_, media_codec_,
-                         state_provider_->GetGlDecoder(), surface_texture_);
+                         state_provider_->GetGlDecoder());
   SetImageForPicture(picture_buffer, gl_image);
 
   if (!surface_texture_ && have_context) {
     // To make devtools work, we're using a 2D texture.  Make it transparent,
     // so that it draws a hole for the SV to show through.  This is only
     // because devtools draws and reads back, which skips overlay processing.
     // It's unclear why devtools renders twice -- once normally, and once
     // including a readback layer.  The result is that the device screen
     // flashes as we alternately draw the overlay hole and this texture,
     // unless we make the texture transparent.
@@ skipping 95 matching lines @@
   shared_state_->CodecChanged(codec);
 }
 
 bool AVDAPictureBufferManager::ArePicturesOverlayable() {
   // SurfaceView frames are always overlayable because that's the only way to
   // display them.
   return !surface_texture_;
 }
 
 }  // namespace media