Index: cc/surfaces/display_unittest.cc |
diff --git a/cc/surfaces/display_unittest.cc b/cc/surfaces/display_unittest.cc |
index b0f9f7ddbace98b076e844bfbc25dee2bc39153c..7b012440907953afdb7a01d3ce5296c41671a0be 100644 |
--- a/cc/surfaces/display_unittest.cc |
+++ b/cc/surfaces/display_unittest.cc |
@@ -2,7 +2,6 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/test/null_task_runner.h" |
#include "cc/output/compositor_frame.h" |
#include "cc/output/copy_output_result.h" |
#include "cc/output/delegated_frame_data.h" |
@@ -16,7 +15,6 @@ |
#include "cc/surfaces/surface_id_allocator.h" |
#include "cc/surfaces/surface_manager.h" |
#include "cc/test/fake_output_surface.h" |
-#include "cc/test/scheduler_test_common.h" |
#include "cc/test/test_shared_bitmap_manager.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -57,48 +55,23 @@ |
SurfaceFactory factory_; |
scoped_ptr<FakeOutputSurface> output_surface_; |
FakeOutputSurface* output_surface_ptr_; |
- FakeBeginFrameSource fake_begin_frame_source_; |
scoped_ptr<SharedBitmapManager> shared_bitmap_manager_; |
}; |
class TestDisplayClient : public DisplayClient { |
public: |
- TestDisplayClient() {} |
+ TestDisplayClient() : damaged(false), swapped(false) {} |
~TestDisplayClient() override {} |
+ void DisplayDamaged() override { damaged = true; } |
+ void DidSwapBuffers() override { swapped = true; } |
+ void DidSwapBuffersComplete() override {} |
void CommitVSyncParameters(base::TimeTicks timebase, |
base::TimeDelta interval) override {} |
void OutputSurfaceLost() override {} |
void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override {} |
-}; |
- |
-class TestDisplayScheduler : public DisplayScheduler { |
- public: |
- TestDisplayScheduler(DisplaySchedulerClient* client, |
- BeginFrameSource* begin_frame_source) |
- : DisplayScheduler(client, |
- begin_frame_source, |
- make_scoped_refptr(new base::NullTaskRunner), |
- 1), |
- damaged(false), |
- entire_display_damaged(false), |
- swapped(false) {} |
- |
- ~TestDisplayScheduler() override {} |
- |
- void EntireDisplayDamaged() override { entire_display_damaged = true; } |
- |
- void SurfaceDamaged(SurfaceId surface_id) override { damaged = true; } |
- |
- void DidSwapBuffers() override { swapped = true; } |
- |
- void ResetDamageForTest() { |
- damaged = false; |
- entire_display_damaged = false; |
- } |
bool damaged; |
- bool entire_display_damaged; |
bool swapped; |
}; |
@@ -114,20 +87,16 @@ |
Display display(&client, &manager_, shared_bitmap_manager_.get(), nullptr, |
settings); |
- TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_); |
- display.Initialize(output_surface_.Pass(), &scheduler); |
+ display.Initialize(output_surface_.Pass()); |
SurfaceId surface_id(7u); |
- EXPECT_FALSE(scheduler.damaged); |
- EXPECT_FALSE(scheduler.entire_display_damaged); |
+ EXPECT_FALSE(client.damaged); |
display.SetSurfaceId(surface_id, 1.f); |
- EXPECT_FALSE(scheduler.damaged); |
- EXPECT_TRUE(scheduler.entire_display_damaged); |
- |
- scheduler.ResetDamageForTest(); |
+ EXPECT_TRUE(client.damaged); |
+ |
+ client.damaged = false; |
display.Resize(gfx::Size(100, 100)); |
- EXPECT_FALSE(scheduler.damaged); |
- EXPECT_TRUE(scheduler.entire_display_damaged); |
+ EXPECT_TRUE(client.damaged); |
factory_.Create(surface_id); |
@@ -139,15 +108,14 @@ |
pass->id = RenderPassId(1, 1); |
pass_list.push_back(pass.Pass()); |
- scheduler.ResetDamageForTest(); |
+ client.damaged = false; |
SubmitFrame(&pass_list, surface_id); |
- EXPECT_TRUE(scheduler.damaged); |
- EXPECT_FALSE(scheduler.entire_display_damaged); |
- |
- EXPECT_FALSE(scheduler.swapped); |
+ EXPECT_TRUE(client.damaged); |
+ |
+ EXPECT_FALSE(client.swapped); |
EXPECT_EQ(0u, output_surface_ptr_->num_sent_frames()); |
- display.DrawAndSwap(); |
- EXPECT_TRUE(scheduler.swapped); |
+ display.Draw(); |
+ EXPECT_TRUE(client.swapped); |
EXPECT_EQ(1u, output_surface_ptr_->num_sent_frames()); |
SoftwareFrameData* software_data = |
output_surface_ptr_->last_sent_frame().software_frame_data.get(); |
@@ -164,14 +132,13 @@ |
pass->id = RenderPassId(1, 1); |
pass_list.push_back(pass.Pass()); |
- scheduler.ResetDamageForTest(); |
- SubmitFrame(&pass_list, surface_id); |
- EXPECT_TRUE(scheduler.damaged); |
- EXPECT_FALSE(scheduler.entire_display_damaged); |
- |
- scheduler.swapped = false; |
- display.DrawAndSwap(); |
- EXPECT_TRUE(scheduler.swapped); |
+ client.damaged = false; |
+ SubmitFrame(&pass_list, surface_id); |
+ EXPECT_TRUE(client.damaged); |
+ |
+ client.swapped = false; |
+ display.Draw(); |
+ EXPECT_TRUE(client.swapped); |
EXPECT_EQ(2u, output_surface_ptr_->num_sent_frames()); |
software_data = |
output_surface_ptr_->last_sent_frame().software_frame_data.get(); |
@@ -189,14 +156,13 @@ |
pass->id = RenderPassId(1, 1); |
pass_list.push_back(pass.Pass()); |
- scheduler.ResetDamageForTest(); |
- SubmitFrame(&pass_list, surface_id); |
- EXPECT_TRUE(scheduler.damaged); |
- EXPECT_FALSE(scheduler.entire_display_damaged); |
- |
- scheduler.swapped = false; |
- display.DrawAndSwap(); |
- EXPECT_TRUE(scheduler.swapped); |
+ client.damaged = false; |
+ SubmitFrame(&pass_list, surface_id); |
+ EXPECT_TRUE(client.damaged); |
+ |
+ client.swapped = false; |
+ display.Draw(); |
+ EXPECT_TRUE(client.swapped); |
EXPECT_EQ(2u, output_surface_ptr_->num_sent_frames()); |
} |
@@ -208,14 +174,13 @@ |
pass->id = RenderPassId(1, 1); |
pass_list.push_back(pass.Pass()); |
- scheduler.ResetDamageForTest(); |
- SubmitFrame(&pass_list, surface_id); |
- EXPECT_TRUE(scheduler.damaged); |
- EXPECT_FALSE(scheduler.entire_display_damaged); |
- |
- scheduler.swapped = false; |
- display.DrawAndSwap(); |
- EXPECT_TRUE(scheduler.swapped); |
+ client.damaged = false; |
+ SubmitFrame(&pass_list, surface_id); |
+ EXPECT_TRUE(client.damaged); |
+ |
+ client.swapped = false; |
+ display.Draw(); |
+ EXPECT_TRUE(client.swapped); |
EXPECT_EQ(2u, output_surface_ptr_->num_sent_frames()); |
} |
@@ -230,14 +195,13 @@ |
pass->id = RenderPassId(1, 1); |
pass_list.push_back(pass.Pass()); |
- scheduler.ResetDamageForTest(); |
- SubmitFrame(&pass_list, surface_id); |
- EXPECT_TRUE(scheduler.damaged); |
- EXPECT_FALSE(scheduler.entire_display_damaged); |
- |
- scheduler.swapped = false; |
- display.DrawAndSwap(); |
- EXPECT_TRUE(scheduler.swapped); |
+ client.damaged = false; |
+ SubmitFrame(&pass_list, surface_id); |
+ EXPECT_TRUE(client.damaged); |
+ |
+ client.swapped = false; |
+ display.Draw(); |
+ EXPECT_TRUE(client.swapped); |
EXPECT_EQ(3u, output_surface_ptr_->num_sent_frames()); |
EXPECT_TRUE(copy_called); |
} |
@@ -250,7 +214,7 @@ |
pass->id = RenderPassId(1, 1); |
pass_list.push_back(pass.Pass()); |
- scheduler.ResetDamageForTest(); |
+ client.damaged = false; |
scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
pass_list.swap(frame_data->render_pass_list); |
@@ -260,12 +224,11 @@ |
factory_.SubmitFrame(surface_id, frame.Pass(), |
SurfaceFactory::DrawCallback()); |
- EXPECT_TRUE(scheduler.damaged); |
- EXPECT_FALSE(scheduler.entire_display_damaged); |
- |
- scheduler.swapped = false; |
- display.DrawAndSwap(); |
- EXPECT_TRUE(scheduler.swapped); |
+ EXPECT_TRUE(client.damaged); |
+ |
+ client.swapped = false; |
+ display.Draw(); |
+ EXPECT_TRUE(client.swapped); |
EXPECT_EQ(4u, output_surface_ptr_->num_sent_frames()); |
} |