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

Unified Diff: content/browser/renderer_host/compositor_impl_android.cc

Issue 1962493002: Make Mac swap code like other platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android build 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/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 3c58174ed68cf624b779d748e15c8c3006ad35cb..59b20ac4a6a68e473e5623d3827fdd6eeb6dec4d 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -201,8 +201,10 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface,
return command_buffer_proxy;
}
- void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info,
- gfx::SwapResult result) {
+ void OnSwapBuffersCompleted(
+ const std::vector<ui::LatencyInfo>& latency_info,
+ gfx::SwapResult result,
+ const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) {
RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
OutputSurface::OnSwapBuffersComplete();
}
@@ -214,9 +216,11 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface,
private:
CompositorImpl* compositor_;
base::Callback<void(gpu::Capabilities)> populate_gpu_capabilities_callback_;
- base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&,
- gfx::SwapResult)>
- swap_buffers_completion_callback_;
+ base::CancelableCallback<void(
+ const std::vector<ui::LatencyInfo>&,
+ gfx::SwapResult,
+ const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac)>
+ swap_buffers_completion_callback_;
std::unique_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator_;
std::unique_ptr<ExternalBeginFrameSource> begin_frame_source_;
};

Powered by Google App Engine
This is Rietveld 408576698