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

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

Issue 1416493010: Clean up Mac swap acknowledgement code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update latency info Created 5 years, 2 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_surfaceless_browser_compositor_output_surface.cc
diff --git a/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc b/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
index 0ce27732e497d59ed8fe709b11657bcfe4ec98d5..bb9e4b3463cb4bdc7ae2ad34686ca6168f71ee6a 100644
--- a/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
+++ b/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc
@@ -93,12 +93,9 @@ void GpuSurfacelessBrowserCompositorOutputSurface::Reshape(
output_surface_->Reshape(SurfaceSize(), scale_factor);
}
-void GpuSurfacelessBrowserCompositorOutputSurface::OnSwapBuffersCompleted(
+void GpuSurfacelessBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(
const std::vector<ui::LatencyInfo>& latency_info,
gfx::SwapResult result) {
-#if defined(OS_MACOSX)
- NOTREACHED();
-#else
bool force_swap = false;
if (result == gfx::SwapResult::SWAP_NAK_RECREATE_BUFFERS) {
// Even through the swap failed, this is a fixable error so we can pretend
@@ -107,17 +104,10 @@ void GpuSurfacelessBrowserCompositorOutputSurface::OnSwapBuffersCompleted(
output_surface_->RecreateBuffers();
force_swap = true;
}
- GpuBrowserCompositorOutputSurface::OnSwapBuffersCompleted(latency_info,
- result);
+ GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(latency_info,
+ result);
if (force_swap)
client_->SetNeedsRedrawRect(gfx::Rect(SurfaceSize()));
-#endif
}
-#if defined(OS_MACOSX)
-void GpuSurfacelessBrowserCompositorOutputSurface::OnSurfaceDisplayed() {
- OnSwapBuffersComplete();
-}
-#endif
-
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698