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

Unified Diff: cc/output/output_surface_unittest.cc

Issue 16863005: cc: Add BeginFrameArgs (Closed) Base URL: http://git.chromium.org/chromium/src.git@nofrc12
Patch Set: Created 7 years, 6 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: cc/output/output_surface_unittest.cc
diff --git a/cc/output/output_surface_unittest.cc b/cc/output/output_surface_unittest.cc
index 7dcb1cce0fe59ea65f5f6cc51634e3c0a85a9cf5..5ce38c4a40cd6a2228d7cc2381d27aad8d6ee58b 100644
--- a/cc/output/output_surface_unittest.cc
+++ b/cc/output/output_surface_unittest.cc
@@ -41,8 +41,8 @@ class TestOutputSurface : public OutputSurface {
OnVSyncParametersChanged(timebase, interval);
}
- void BeginFrameForTesting(base::TimeTicks frame_time) {
- BeginFrame(frame_time);
+ void BeginFrameForTesting() {
+ BeginFrame(BeginFrameArgs::CreateBeginFrameForTesting());
}
void DidSwapBuffersForTesting() {
@@ -72,7 +72,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
return deferred_initialize_result_;
}
virtual void SetNeedsRedrawRect(gfx::Rect damage_rect) OVERRIDE {}
- virtual void BeginFrame(base::TimeTicks frame_time) OVERRIDE {
+ virtual void BeginFrame(BeginFrameArgs args) OVERRIDE {
begin_frame_count_++;
}
virtual void OnSwapBuffersComplete(const CompositorFrameAck* ack) OVERRIDE {}
@@ -279,13 +279,13 @@ TEST(OutputSurfaceTest, BeginFrameEmulation) {
// Optimistically injected BeginFrames without a SetNeedsBeginFrame should be
// allowed.
- output_surface.BeginFrameForTesting(base::TimeTicks::Now());
+ output_surface.BeginFrameForTesting();
EXPECT_EQ(client.begin_frame_count(), 5);
EXPECT_EQ(output_surface.pending_swap_buffers(), 1);
// Optimistically injected BeginFrames without a SetNeedsBeginFrame should
// still be throttled by pending begin frames however.
- output_surface.BeginFrameForTesting(base::TimeTicks::Now());
+ output_surface.BeginFrameForTesting();
EXPECT_EQ(client.begin_frame_count(), 5);
EXPECT_EQ(output_surface.pending_swap_buffers(), 1);
@@ -294,7 +294,7 @@ TEST(OutputSurfaceTest, BeginFrameEmulation) {
output_surface.DidSwapBuffersForTesting();
EXPECT_EQ(client.begin_frame_count(), 5);
EXPECT_EQ(output_surface.pending_swap_buffers(), 2);
- output_surface.BeginFrameForTesting(base::TimeTicks::Now());
+ output_surface.BeginFrameForTesting();
EXPECT_EQ(client.begin_frame_count(), 5);
EXPECT_EQ(output_surface.pending_swap_buffers(), 2);
}

Powered by Google App Engine
This is Rietveld 408576698