| Index: media/gpu/avda_codec_image.h | 
| diff --git a/media/gpu/avda_codec_image.h b/media/gpu/avda_codec_image.h | 
| index 6d5e33d0ee5c669bb002f59d8537c34bdd3e4901..1b94bb5b16c19514d009c82181ae619d37129ae9 100644 | 
| --- a/media/gpu/avda_codec_image.h | 
| +++ b/media/gpu/avda_codec_image.h | 
| @@ -74,13 +74,14 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage { | 
|  | 
| void set_texture(gpu::gles2::Texture* texture) { texture_ = texture; } | 
|  | 
| -  // Decoded buffer index that has the image for us to display. | 
| -  void set_media_codec_buffer_index(int buffer_index) { | 
| -    codec_buffer_index_ = buffer_index; | 
| -  } | 
| +  // Sets up the properties necessary for the image to render. |buffer_index| is | 
| +  // supplied to ReleaseOutputBuffer(), |has_surface_texture| controls which | 
| +  // rendering path is used, and |size| is used by the compositor. | 
| +  void SetBufferMetadata(int buffer_index, | 
| +                         bool has_surface_texture, | 
| +                         const gfx::Size& size); | 
|  | 
| -  // Set the size of the current image. | 
| -  void set_size(const gfx::Size& size) { size_ = size; } | 
| +  bool SetSharedState(const scoped_refptr<AVDASharedState>& shared_state); | 
|  | 
| // Indicates if the codec buffer has been released to the back buffer. | 
| bool was_rendered_to_back_buffer() const { | 
| @@ -92,6 +93,8 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage { | 
| return codec_buffer_index_ == kRendered; | 
| } | 
|  | 
| +  bool is_unrendered() const { return codec_buffer_index_ >= kUpdateOnly; } | 
| + | 
| protected: | 
| ~AVDACodecImage() override; | 
|  | 
| @@ -141,8 +144,9 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage { | 
|  | 
| const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder_; | 
|  | 
| -  // Indicates if we're rendering to a SurfaceTexture or not. | 
| -  const bool has_surface_texture_; | 
| +  // Indicates if we're rendering to a SurfaceTexture or not. Set during the | 
| +  // call to SetBufferMetadata(). | 
| +  bool has_surface_texture_; | 
|  | 
| // The texture that we're attached to. | 
| gpu::gles2::Texture* texture_; | 
|  |