Index: content/renderer/gpu/renderer_compositor_frame_sink.cc |
diff --git a/content/renderer/gpu/renderer_compositor_frame_sink.cc b/content/renderer/gpu/renderer_compositor_frame_sink.cc |
index f06784c42a312865cc027ea7ac8d7d73b27e29d7..b968be07ac3671059dd6496301854b2ab7d0c208 100644 |
--- a/content/renderer/gpu/renderer_compositor_frame_sink.cc |
+++ b/content/renderer/gpu/renderer_compositor_frame_sink.cc |
@@ -123,6 +123,7 @@ void RendererCompositorFrameSink::DetachFromClient() { |
void RendererCompositorFrameSink::SubmitCompositorFrame( |
cc::CompositorFrame frame) { |
// We should only submit CompositorFrames with valid BeginFrameAcks. |
+ DCHECK(frame.metadata.begin_frame_ack.has_damage); |
DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, |
frame.metadata.begin_frame_ack.sequence_number); |
if (ShouldAllocateNewLocalSurfaceId(frame)) |
@@ -150,6 +151,13 @@ void RendererCompositorFrameSink::SubmitCompositorFrame( |
} |
} |
+void RendererCompositorFrameSink::BeginFrameDidNotProduceFrame( |
+ const cc::BeginFrameAck& ack) { |
+ DCHECK(!ack.has_damage); |
+ DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, ack.sequence_number); |
+ sink_->BeginFrameDidNotProduceFrame(ack); |
+} |
+ |
void RendererCompositorFrameSink::OnMessageReceived( |
const IPC::Message& message) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
@@ -231,14 +239,6 @@ void RendererCompositorFrameSink::OnNeedsBeginFrames(bool needs_begin_frames) { |
sink_->SetNeedsBeginFrame(needs_begin_frames); |
} |
-void RendererCompositorFrameSink::OnDidFinishFrame( |
- const cc::BeginFrameAck& ack) { |
- DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, ack.sequence_number); |
- // If there was damage, ViewHostMsg_SwapCompositorFrame includes the ack. |
- if (!ack.has_damage) |
- sink_->BeginFrameDidNotSwap(ack); |
-} |
- |
void RendererCompositorFrameSink::EstablishMojoConnection() { |
cc::mojom::MojoCompositorFrameSinkPtr sink; |
cc::mojom::MojoCompositorFrameSinkRequest sink_request = |