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

Unified Diff: cc/surfaces/display_unittest.cc

Issue 1201573002: cc: Remove BeginFrameSourcesConstructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/surfaces/display_unittest.cc
diff --git a/cc/surfaces/display_unittest.cc b/cc/surfaces/display_unittest.cc
index c0213905551f3e310e3a7616e50f7f851e69cc19..41d6c1a0354dbfbaec83ed41347047a77eeb63b7 100644
--- a/cc/surfaces/display_unittest.cc
+++ b/cc/surfaces/display_unittest.cc
@@ -66,6 +66,7 @@ class DisplayTest : public testing::Test {
FakeOutputSurface* output_surface_ptr_;
FakeBeginFrameSource fake_begin_frame_source_;
scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
+ scoped_refptr<base::NullTaskRunner> task_runner_;
};
class TestDisplayClient : public DisplayClient {
@@ -82,11 +83,9 @@ class TestDisplayClient : public DisplayClient {
class TestDisplayScheduler : public DisplayScheduler {
public:
TestDisplayScheduler(DisplaySchedulerClient* client,
- BeginFrameSource* begin_frame_source)
- : DisplayScheduler(client,
- begin_frame_source,
- make_scoped_refptr(new base::NullTaskRunner),
- 1),
+ BeginFrameSource* begin_frame_source,
+ base::NullTaskRunner* task_runner)
+ : DisplayScheduler(client, begin_frame_source, task_runner, 1),
damaged(false),
entire_display_damaged(false),
swapped(false) {}
@@ -128,7 +127,8 @@ TEST_F(DisplayTest, DisplayDamaged) {
Display display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
settings);
- TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_);
+ TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_,
+ task_runner_.get());
display.Initialize(output_surface_.Pass(), &scheduler);
SurfaceId surface_id(7u);
@@ -335,7 +335,8 @@ TEST_F(DisplayTest, Finish) {
Display display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
settings);
- TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_);
+ TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_,
+ task_runner_.get());
display.Initialize(output_surface_.Pass(), &scheduler);
SurfaceId surface_id(7u);

Powered by Google App Engine
This is Rietveld 408576698