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

Unified Diff: services/ui/public/cpp/client_compositor_frame_sink.cc

Issue 2755463002: [cc] Fix CompositorFrameSinkSupport BeginFrameAck interface. (Closed)
Patch Set: sync Created 3 years, 9 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: services/ui/public/cpp/client_compositor_frame_sink.cc
diff --git a/services/ui/public/cpp/client_compositor_frame_sink.cc b/services/ui/public/cpp/client_compositor_frame_sink.cc
index da44887cc3d03af93ac02669343579cf055c38df..2b6d626e56ba44ba7c27806938cd096cb25f9040 100644
--- a/services/ui/public/cpp/client_compositor_frame_sink.cc
+++ b/services/ui/public/cpp/client_compositor_frame_sink.cc
@@ -8,6 +8,7 @@
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "cc/base/switches.h"
+#include "cc/output/begin_frame_args.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/compositor_frame_sink_client.h"
@@ -77,6 +78,9 @@ void ClientCompositorFrameSink::SubmitCompositorFrame(
if (!compositor_frame_sink_)
return;
+ DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber,
+ frame.metadata.begin_frame_ack.sequence_number);
+
gfx::Size frame_size = last_submitted_frame_size_;
if (!frame.render_pass_list.empty())
frame_size = frame.render_pass_list.back()->output_rect.size();
@@ -141,7 +145,9 @@ void ClientCompositorFrameSink::OnNeedsBeginFrames(bool needs_begin_frames) {
}
void ClientCompositorFrameSink::OnDidFinishFrame(const cc::BeginFrameAck& ack) {
- // TODO(eseckler): Pass on the ack to compositor_frame_sink_.
+ // If there was damage, the submitted CompositorFrame includes the ack.
+ if (!ack.has_damage)
+ compositor_frame_sink_->BeginFrameDidNotSwap(ack);
}
ClientCompositorFrameSinkBinding::~ClientCompositorFrameSinkBinding() {}
« no previous file with comments | « content/renderer/android/synchronous_compositor_frame_sink.cc ('k') | services/ui/ws/display_client_compositor_frame_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698