| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index efc644aa68392c7d7f4e576c4b7dd95b23778df0..746cf3c143c3051f2f4aafbe215bddfa1a08dca8 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -7081,32 +7081,41 @@ class LayerTreeHostTestBeginFrameSequenceNumbers : public LayerTreeHostTest {
|
| return draw_result;
|
| }
|
|
|
| - void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
|
| - EXPECT_TRUE(frame_data_);
|
| + void DisplayReceivedCompositorFrameOnThread(
|
| + const CompositorFrame& frame) override {
|
| + if (compositor_frame_submitted_)
|
| + return;
|
| + compositor_frame_submitted_ = true;
|
| +
|
| EXPECT_EQ(
|
| BeginFrameAck(current_begin_frame_args_.source_id,
|
| current_begin_frame_args_.sequence_number,
|
| current_begin_main_frame_args_on_impl_.sequence_number, 0,
|
| true),
|
| - frame_data_->begin_frame_ack);
|
| + frame.metadata.begin_frame_ack);
|
| }
|
|
|
| - void DisplayReceivedCompositorFrameOnThread(
|
| - const CompositorFrame& frame) override {
|
| - compositor_frame_submitted_ = true;
|
| + void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
|
| + if (layers_drawn_)
|
| + return;
|
| + layers_drawn_ = true;
|
| +
|
| + EXPECT_TRUE(frame_data_);
|
| + EXPECT_TRUE(compositor_frame_submitted_);
|
| EXPECT_EQ(
|
| BeginFrameAck(current_begin_frame_args_.source_id,
|
| current_begin_frame_args_.sequence_number,
|
| current_begin_main_frame_args_on_impl_.sequence_number, 0,
|
| true),
|
| - frame.metadata.begin_frame_ack);
|
| + frame_data_->begin_frame_ack);
|
| EndTest();
|
| }
|
|
|
| - void AfterTest() override { EXPECT_TRUE(compositor_frame_submitted_); }
|
| + void AfterTest() override { EXPECT_TRUE(layers_drawn_); }
|
|
|
| private:
|
| - bool compositor_frame_submitted_;
|
| + bool compositor_frame_submitted_ = false;
|
| + bool layers_drawn_ = false;
|
| BeginFrameArgs current_begin_frame_args_;
|
| BeginFrameArgs current_begin_main_frame_args_;
|
| BeginFrameArgs current_begin_main_frame_args_on_impl_;
|
|
|