summaryrefslogtreecommitdiffstats
path: root/cc/surfaces/display_unittest.cc
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2015-08-24 09:41:01 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-24 16:41:36 +0000
commitcb87fbf3f0f6be220afb257fab882fdbe2d9e2fe (patch)
tree6a6d623daba2ee96375d44c6d903e3c90992921c /cc/surfaces/display_unittest.cc
parent9573300cf356720be3a8362fbffe77425ccd3fba (diff)
downloadchromium_src-cb87fbf3f0f6be220afb257fab882fdbe2d9e2fe.zip
chromium_src-cb87fbf3f0f6be220afb257fab882fdbe2d9e2fe.tar.gz
chromium_src-cb87fbf3f0f6be220afb257fab882fdbe2d9e2fe.tar.bz2
Rename several instances of SubmitFrame to SubmitCompositorFrame
In an effort to disambiguate compositor frames from web platform frames, I've begun renaming ambiguous sites to an unambiguous name. BUG=none, rename CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel TBR=jam@chromium.org for content + pdf_viewer trivial rename. TBR=boliu@chromium.org for trivial rename in android_webview. Review URL: https://codereview.chromium.org/1292733003 Cr-Commit-Position: refs/heads/master@{#345095}
Diffstat (limited to 'cc/surfaces/display_unittest.cc')
-rw-r--r--cc/surfaces/display_unittest.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/cc/surfaces/display_unittest.cc b/cc/surfaces/display_unittest.cc
index facb40e9..6058f15 100644
--- a/cc/surfaces/display_unittest.cc
+++ b/cc/surfaces/display_unittest.cc
@@ -61,15 +61,15 @@ class DisplayTest : public testing::Test {
output_surface_ptr_ = output_surface_.get();
}
- void SubmitFrame(RenderPassList* pass_list, SurfaceId surface_id) {
+ void SubmitCompositorFrame(RenderPassList* pass_list, SurfaceId surface_id) {
scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
pass_list->swap(frame_data->render_pass_list);
scoped_ptr<CompositorFrame> frame(new CompositorFrame);
frame->delegated_frame_data = frame_data.Pass();
- factory_.SubmitFrame(surface_id, frame.Pass(),
- SurfaceFactory::DrawCallback());
+ factory_.SubmitCompositorFrame(surface_id, frame.Pass(),
+ SurfaceFactory::DrawCallback());
}
SurfaceManager manager_;
@@ -175,7 +175,7 @@ TEST_F(DisplayTest, DisplayDamaged) {
pass_list.push_back(pass.Pass());
scheduler.ResetDamageForTest();
- SubmitFrame(&pass_list, surface_id);
+ SubmitCompositorFrame(&pass_list, surface_id);
EXPECT_TRUE(scheduler.damaged);
EXPECT_FALSE(scheduler.display_resized_);
EXPECT_FALSE(scheduler.has_new_root_surface);
@@ -198,7 +198,7 @@ TEST_F(DisplayTest, DisplayDamaged) {
pass_list.push_back(pass.Pass());
scheduler.ResetDamageForTest();
- SubmitFrame(&pass_list, surface_id);
+ SubmitCompositorFrame(&pass_list, surface_id);
EXPECT_TRUE(scheduler.damaged);
EXPECT_FALSE(scheduler.display_resized_);
EXPECT_FALSE(scheduler.has_new_root_surface);
@@ -221,7 +221,7 @@ TEST_F(DisplayTest, DisplayDamaged) {
pass_list.push_back(pass.Pass());
scheduler.ResetDamageForTest();
- SubmitFrame(&pass_list, surface_id);
+ SubmitCompositorFrame(&pass_list, surface_id);
EXPECT_TRUE(scheduler.damaged);
EXPECT_FALSE(scheduler.display_resized_);
EXPECT_FALSE(scheduler.has_new_root_surface);
@@ -241,7 +241,7 @@ TEST_F(DisplayTest, DisplayDamaged) {
pass_list.push_back(pass.Pass());
scheduler.ResetDamageForTest();
- SubmitFrame(&pass_list, surface_id);
+ SubmitCompositorFrame(&pass_list, surface_id);
EXPECT_TRUE(scheduler.damaged);
EXPECT_FALSE(scheduler.display_resized_);
EXPECT_FALSE(scheduler.has_new_root_surface);
@@ -261,7 +261,7 @@ TEST_F(DisplayTest, DisplayDamaged) {
pass_list.push_back(pass.Pass());
scheduler.ResetDamageForTest();
- SubmitFrame(&pass_list, surface_id);
+ SubmitCompositorFrame(&pass_list, surface_id);
EXPECT_TRUE(scheduler.damaged);
EXPECT_FALSE(scheduler.display_resized_);
EXPECT_FALSE(scheduler.has_new_root_surface);
@@ -286,7 +286,7 @@ TEST_F(DisplayTest, DisplayDamaged) {
pass_list.push_back(pass.Pass());
scheduler.ResetDamageForTest();
- SubmitFrame(&pass_list, surface_id);
+ SubmitCompositorFrame(&pass_list, surface_id);
EXPECT_TRUE(scheduler.damaged);
EXPECT_FALSE(scheduler.display_resized_);
EXPECT_FALSE(scheduler.has_new_root_surface);
@@ -314,8 +314,8 @@ TEST_F(DisplayTest, DisplayDamaged) {
frame->delegated_frame_data = frame_data.Pass();
frame->metadata.latency_info.push_back(ui::LatencyInfo());
- factory_.SubmitFrame(surface_id, frame.Pass(),
- SurfaceFactory::DrawCallback());
+ factory_.SubmitCompositorFrame(surface_id, frame.Pass(),
+ SurfaceFactory::DrawCallback());
EXPECT_TRUE(scheduler.damaged);
EXPECT_FALSE(scheduler.display_resized_);
EXPECT_FALSE(scheduler.has_new_root_surface);
@@ -346,8 +346,8 @@ TEST_F(DisplayTest, DisplayDamaged) {
scoped_ptr<CompositorFrame> frame(new CompositorFrame);
frame->delegated_frame_data = frame_data.Pass();
- factory_.SubmitFrame(surface_id, frame.Pass(),
- SurfaceFactory::DrawCallback());
+ factory_.SubmitCompositorFrame(surface_id, frame.Pass(),
+ SurfaceFactory::DrawCallback());
EXPECT_TRUE(scheduler.damaged);
EXPECT_FALSE(scheduler.display_resized_);
EXPECT_FALSE(scheduler.has_new_root_surface);
@@ -397,7 +397,7 @@ TEST_F(DisplayTest, Finish) {
pass->id = RenderPassId(1, 1);
pass_list.push_back(pass.Pass());
- SubmitFrame(&pass_list, surface_id);
+ SubmitCompositorFrame(&pass_list, surface_id);
}
display.DrawAndSwap();
@@ -423,7 +423,7 @@ TEST_F(DisplayTest, Finish) {
pass->id = RenderPassId(1, 1);
pass_list.push_back(pass.Pass());
- SubmitFrame(&pass_list, surface_id);
+ SubmitCompositorFrame(&pass_list, surface_id);
}
display.DrawAndSwap();