Revert of Make Android StreamTexture implement GLStreamTextureImage

content/common/gpu/stream_texture_android.h

 // Copyright (c) 2013 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 CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
 #define CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
-#include "gpu/command_buffer/service/gl_stream_texture_image.h"
 #include "ipc/ipc_listener.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_image.h"
 
 namespace ui {
 class ScopedMakeCurrent;
 }
 
 namespace gfx {
 class Size;
 }
 
 namespace content {
 
-class StreamTexture : public gpu::gles2::GLStreamTextureImage,
+class StreamTexture : public gl::GLImage,
                       public IPC::Listener,
                       public GpuCommandBufferStub::DestructionObserver {
  public:
   static bool Create(GpuCommandBufferStub* owner_stub,
                      uint32_t client_texture_id,
                      int stream_id);
 
  private:
   StreamTexture(GpuCommandBufferStub* owner_stub,
                 int32_t route_id,
@@ skipping 12 matching lines @@
                        const gfx::Rect& rect) override;
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int z_order,
                             gfx::OverlayTransform transform,
                             const gfx::Rect& bounds_rect,
                             const gfx::RectF& crop_rect) override;
   void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
                     uint64_t process_tracing_id,
                     const std::string& dump_name) override;
 
-  // gpu::gles2::GLStreamTextureMatrix implementation
-  void GetTextureMatrix(float xform[16]) override;
-
   // GpuCommandBufferStub::DestructionObserver implementation.
   void OnWillDestroyStub() override;
 
   scoped_ptr<ui::ScopedMakeCurrent> MakeStubCurrent();
 
   void UpdateTexImage();
 
   // Called when a new frame is available for the SurfaceTexture.
   void OnFrameAvailable();
 
   // IPC::Listener implementation:
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC message handlers:
   void OnStartListening();
   void OnEstablishPeer(int32_t primary_id, int32_t secondary_id);
   void OnSetSize(const gfx::Size& size) { size_ = size; }
 
   scoped_refptr<gfx::SurfaceTexture> surface_texture_;
 
   // Current transform matrix of the surface texture.
   float current_matrix_[16];
 
   // Current size of the surface texture.
   gfx::Size size_;
 
+  // Whether we ever bound a valid frame.
+  bool has_valid_frame_;
+
   // Whether a new frame is available that we should update to.
   bool has_pending_frame_;
 
   GpuCommandBufferStub* owner_stub_;
   int32_t route_id_;
   bool has_listener_;
   uint32_t texture_id_;
 
   unsigned framebuffer_;
   unsigned vertex_shader_;
   unsigned fragment_shader_;
   unsigned program_;
   unsigned vertex_buffer_;
   int u_xform_location_;
 
   base::WeakPtrFactory<StreamTexture> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(StreamTexture);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_