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

Unified Diff: content/browser/compositor/gpu_browser_compositor_output_surface.h

Issue 2018603002: Mac: Clean up ifdefs in output surface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporate review feedback 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
« no previous file with comments | « no previous file | content/browser/compositor/gpu_browser_compositor_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gpu_browser_compositor_output_surface.h
diff --git a/content/browser/compositor/gpu_browser_compositor_output_surface.h b/content/browser/compositor/gpu_browser_compositor_output_surface.h
index 542f294c2dddc9fdb77b9b23c47da06b460831bc..cc6668110338ea272497e49208d8100472583727 100644
--- a/content/browser/compositor/gpu_browser_compositor_output_surface.h
+++ b/content/browser/compositor/gpu_browser_compositor_output_surface.h
@@ -50,28 +50,13 @@ class GpuBrowserCompositorOutputSurface
const std::vector<ui::LatencyInfo>& latency_info,
gfx::SwapResult result,
const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override;
-
- // cc::OutputSurface implementation.
- void SwapBuffers(cc::CompositorFrame* frame) override;
- bool BindToClient(cc::OutputSurfaceClient* client) override;
- bool SurfaceIsSuspendForRecycle() const override;
-
#if defined(OS_MACOSX)
void SetSurfaceSuspendedForRecycle(bool suspended) override;
- enum ShouldShowFramesState {
- // Frames that come from the GPU process should appear on-screen.
- SHOULD_SHOW_FRAMES,
- // The compositor has been suspended. Any frames that come from the GPU
- // process are for the pre-suspend content and should not be displayed.
- SHOULD_NOT_SHOW_FRAMES_SUSPENDED,
- // The compositor has been un-suspended, but has not yet issued a swap
- // since being un-suspended, so any frames that come from the GPU process
- // are for pre-suspend content and should not be displayed.
- SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED,
- };
- ShouldShowFramesState should_show_frames_state_;
#endif
+ // cc::OutputSurface implementation.
+ void SwapBuffers(cc::CompositorFrame* frame) override;
+ bool BindToClient(cc::OutputSurfaceClient* client) override;
gpu::CommandBufferProxyImpl* GetCommandBufferProxy();
base::CancelableCallback<void(
« no previous file with comments | « no previous file | content/browser/compositor/gpu_browser_compositor_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698