| Index: ui/gl/gl_image_surface_texture.cc
|
| diff --git a/ui/gl/gl_image_surface_texture.cc b/ui/gl/gl_image_surface_texture.cc
|
| index 4fed45b6b19a7152a3d7875f654d15c21797a89a..27c9f64184d676d960712ff2e228b511aae6c45d 100644
|
| --- a/ui/gl/gl_image_surface_texture.cc
|
| +++ b/ui/gl/gl_image_surface_texture.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/debug/trace_event.h"
|
| #include "ui/gl/android/surface_texture.h"
|
| -#include "ui/gl/android/surface_texture_tracker.h"
|
|
|
| namespace gfx {
|
|
|
| @@ -19,14 +18,10 @@ GLImageSurfaceTexture::~GLImageSurfaceTexture() {
|
| DCHECK_EQ(0, texture_id_);
|
| }
|
|
|
| -bool GLImageSurfaceTexture::Initialize(
|
| - const gfx::GpuMemoryBufferHandle& handle) {
|
| +bool GLImageSurfaceTexture::Initialize(SurfaceTexture* surface_texture) {
|
| DCHECK(!surface_texture_.get());
|
| - surface_texture_ =
|
| - SurfaceTextureTracker::GetInstance()->AcquireSurfaceTexture(
|
| - handle.surface_texture_id.primary_id,
|
| - handle.surface_texture_id.secondary_id);
|
| - return !!surface_texture_.get();
|
| + surface_texture_ = surface_texture;
|
| + return true;
|
| }
|
|
|
| void GLImageSurfaceTexture::Destroy(bool have_context) {
|
|
|