| Index: content/common/gpu/image_transport_surface.cc
|
| diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc
|
| index 1cdbd801e256a49872ed1c2a4b07ee56f09b2386..8f8611d844ce73899f45fa8ce686eec3beec1258 100644
|
| --- a/content/common/gpu/image_transport_surface.cc
|
| +++ b/content/common/gpu/image_transport_surface.cc
|
| @@ -66,9 +66,6 @@ bool ImageTransportHelper::Initialize() {
|
| if (!decoder)
|
| return false;
|
|
|
| - decoder->SetResizeCallback(
|
| - base::Bind(&ImageTransportHelper::Resize, base::Unretained(this)));
|
| -
|
| stub_->SetLatencyInfoCallback(
|
| base::Bind(&ImageTransportHelper::SetLatencyInfo,
|
| base::Unretained(this)));
|
| @@ -135,15 +132,6 @@ void ImageTransportHelper::OnBufferPresented(
|
| }
|
| #endif
|
|
|
| -void ImageTransportHelper::Resize(gfx::Size size, float scale_factor) {
|
| - surface_->OnResize(size, scale_factor);
|
| -
|
| -#if defined(OS_ANDROID)
|
| - manager_->gpu_memory_manager()->ScheduleManage(
|
| - GpuMemoryManager::kScheduleManageNow);
|
| -#endif
|
| -}
|
| -
|
| void ImageTransportHelper::SetLatencyInfo(
|
| const std::vector<ui::LatencyInfo>& latency_info) {
|
| surface_->SetLatencyInfo(latency_info);
|
| @@ -154,6 +142,7 @@ PassThroughImageTransportSurface::PassThroughImageTransportSurface(
|
| GpuCommandBufferStub* stub,
|
| gfx::GLSurface* surface)
|
| : GLSurfaceAdapter(surface),
|
| + manager_(manager),
|
| did_set_swap_interval_(false),
|
| weak_ptr_factory_(this) {
|
| helper_.reset(new ImageTransportHelper(this,
|
| @@ -258,11 +247,6 @@ void PassThroughImageTransportSurface::OnBufferPresented(
|
| }
|
| #endif
|
|
|
| -void PassThroughImageTransportSurface::OnResize(gfx::Size size,
|
| - float scale_factor) {
|
| - Resize(size);
|
| -}
|
| -
|
| gfx::Size PassThroughImageTransportSurface::GetSize() {
|
| return GLSurfaceAdapter::GetSize();
|
| }
|
|
|