Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 1963263002: Fix Mac resize, delete more Mac code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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>

Powered by Google App Engine
This is Rietveld 408576698