| Index: content/renderer/media/video_frame_compositor_unittest.cc
|
| diff --git a/content/renderer/media/video_frame_compositor_unittest.cc b/content/renderer/media/video_frame_compositor_unittest.cc
|
| index 2f4163ce2158632e18b656befeebcd8e37527098..bfe1f44086f7890684d1e4e1aa4cadcaa2d639a2 100644
|
| --- a/content/renderer/media/video_frame_compositor_unittest.cc
|
| +++ b/content/renderer/media/video_frame_compositor_unittest.cc
|
| @@ -132,37 +132,23 @@ TEST_F(VideoFrameCompositorTest, GetFramesDroppedBeforeComposite) {
|
| EXPECT_EQ(0, did_receive_frame_count());
|
| EXPECT_EQ(0u, compositor()->GetFramesDroppedBeforeComposite());
|
|
|
| - // Should not increment if we finished notifying the compositor but didn't
|
| - // composite the frame.
|
| + // Should not increment if we finished notifying the compositor.
|
| //
|
| - // This covers the scenario where the region we're rendering isn't
|
| - // visible so there wasn't a need to composite.
|
| + // This covers the normal scenario where the compositor is getting
|
| + // notifications in a timely manner.
|
| message_loop()->RunUntilIdle();
|
| compositor()->UpdateCurrentFrame(frame);
|
| EXPECT_EQ(1, did_receive_frame_count());
|
| EXPECT_EQ(0u, compositor()->GetFramesDroppedBeforeComposite());
|
|
|
| - // Should not increment if we didn't finish notifying the compositor but still
|
| - // managed to composite the frame.
|
| + // Should increment if we didn't notify the compositor.
|
| //
|
| - // This covers the scenario where something else may have notified the
|
| - // compositor and managed to composite the current frame.
|
| - message_loop()->RunUntilIdle();
|
| - provider()->GetCurrentFrame();
|
| - provider()->PutCurrentFrame(NULL);
|
| - compositor()->UpdateCurrentFrame(frame);
|
| - EXPECT_EQ(2, did_receive_frame_count());
|
| - EXPECT_EQ(0u, compositor()->GetFramesDroppedBeforeComposite());
|
| -
|
| - // Should increment if we didn't notify the compositor and didn't composite
|
| - // the frame.
|
| - //
|
| - // This covers the scenario where we didn't even finish notifying nor
|
| - // compositing the current frame before updating. Consider it dropped.
|
| + // This covers the scenario where the compositor is falling behind.
|
| + // Consider it dropped.
|
| message_loop()->RunUntilIdle();
|
| compositor()->UpdateCurrentFrame(frame);
|
| compositor()->UpdateCurrentFrame(frame);
|
| - EXPECT_EQ(3, did_receive_frame_count());
|
| + EXPECT_EQ(2, did_receive_frame_count());
|
| EXPECT_EQ(1u, compositor()->GetFramesDroppedBeforeComposite());
|
|
|
| // Shouldn't overflow.
|
|
|