Index: services/ui/ws/frame_generator_unittest.cc |
diff --git a/services/ui/ws/frame_generator_unittest.cc b/services/ui/ws/frame_generator_unittest.cc |
index 03aef330bc0a16480fe56d8318314d4899301ade..000dd69c59c32bea1746ae1d36405e705df30b50 100644 |
--- a/services/ui/ws/frame_generator_unittest.cc |
+++ b/services/ui/ws/frame_generator_unittest.cc |
@@ -65,6 +65,11 @@ class FakeCompositorFrameSink : public cc::CompositorFrameSink, |
void SubmitCompositorFrame(cc::CompositorFrame frame) override { |
++number_frames_received_; |
last_frame_ = std::move(frame); |
+ last_begin_frame_ack_ = last_frame_.metadata.begin_frame_ack; |
+ } |
+ |
+ void BeginFrameDidNotProduceFrame(const cc::BeginFrameAck& ack) override { |
+ last_begin_frame_ack_ = ack; |
} |
// cc::BeginFrameObserver implementation. |
@@ -85,9 +90,7 @@ class FakeCompositorFrameSink : public cc::CompositorFrameSink, |
UpdateNeedsBeginFramesInternal(); |
} |
- void OnDidFinishFrame(const cc::BeginFrameAck& ack) override { |
- begin_frame_source_->DidFinishFrame(this, ack); |
- } |
+ void OnDidFinishFrame(const cc::BeginFrameAck& ack) override {} |
void SetBeginFrameSource(cc::BeginFrameSource* source) { |
if (begin_frame_source_ && observing_begin_frames_) { |
@@ -108,6 +111,10 @@ class FakeCompositorFrameSink : public cc::CompositorFrameSink, |
int number_frames_received() { return number_frames_received_; } |
+ const cc::BeginFrameAck& last_begin_frame_ack() { |
sunnyps
2017/05/22 07:17:12
nit: const method
Eric Seckler
2017/05/22 11:29:58
Done.
|
+ return last_begin_frame_ack_; |
+ } |
+ |
private: |
void UpdateNeedsBeginFramesInternal() { |
if (!begin_frame_source_) |
@@ -131,6 +138,7 @@ class FakeCompositorFrameSink : public cc::CompositorFrameSink, |
bool observing_begin_frames_ = false; |
bool needs_begin_frames_ = false; |
cc::CompositorFrame last_frame_; |
+ cc::BeginFrameAck last_begin_frame_ack_; |
DISALLOW_COPY_AND_ASSIGN(FakeCompositorFrameSink); |
}; |
@@ -194,7 +202,7 @@ class FrameGeneratorTest : public testing::Test { |
} |
const cc::BeginFrameAck& LastBeginFrameAck() { |
- return begin_frame_source_->LastAckForObserver(compositor_frame_sink_); |
+ return compositor_frame_sink_->last_begin_frame_ack(); |
} |
private: |