| Index: content/browser/compositor/gpu_process_transport_factory.cc
|
| diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
|
| index 5d2bf4f580c2ce46eeaa0a12318d6cd60bbf9c5c..cb8d9548d4741e55407b7ab09d622497e36eb45d 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.cc
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
| @@ -276,11 +276,6 @@ void GpuProcessTransportFactory::CreateOutputSurface(
|
| if (!data) {
|
| data = CreatePerCompositorData(compositor.get());
|
| } else {
|
| -#if defined(OS_MACOSX)
|
| - // TODO(piman): Use GpuSurfaceTracker to map ids to surfaces instead of an
|
| - // output_surface_map_ here.
|
| - output_surface_map_.Remove(data->surface_handle);
|
| -#endif
|
| data->surface = nullptr;
|
| }
|
|
|
| @@ -476,11 +471,6 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
|
| }
|
| }
|
|
|
| -#if defined(OS_MACOSX)
|
| - // TODO(piman): Use GpuSurfaceTracker to map ids to surfaces instead of an
|
| - // output_surface_map_ here.
|
| - output_surface_map_.AddWithID(surface.get(), data->surface_handle);
|
| -#endif
|
| data->surface = surface.get();
|
| if (data->reflector)
|
| data->reflector->OnSourceSurfaceReady(data->surface);
|
| @@ -547,12 +537,6 @@ void GpuProcessTransportFactory::RemoveCompositor(ui::Compositor* compositor) {
|
| return;
|
| PerCompositorData* data = it->second;
|
| DCHECK(data);
|
| -#if defined(OS_MACOSX)
|
| - // TODO(piman): Use GpuSurfaceTracker to map ids to surfaces instead of an
|
| - // output_surface_map_ here.
|
| - if (data->surface)
|
| - output_surface_map_.Remove(data->surface_handle);
|
| -#endif
|
| #if !defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW)
|
| if (data->surface_handle)
|
| GpuSurfaceTracker::Get()->RemoveSurface(data->surface_handle);
|
| @@ -679,16 +663,6 @@ void GpuProcessTransportFactory::SetCompositorSuspendedForRecycle(
|
| if (data->surface)
|
| data->surface->SetSurfaceSuspendedForRecycle(suspended);
|
| }
|
| -
|
| -bool GpuProcessTransportFactory::
|
| - SurfaceShouldNotShowFramesAfterSuspendForRecycle(
|
| - gpu::SurfaceHandle surface_handle) const {
|
| - BrowserCompositorOutputSurface* surface =
|
| - output_surface_map_.Lookup(surface_handle);
|
| - if (surface)
|
| - return surface->SurfaceShouldNotShowFramesAfterSuspendForRecycle();
|
| - return false;
|
| -}
|
| #endif
|
|
|
| scoped_refptr<cc::ContextProvider>
|
|
|