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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/scheduler/begin_frame_source_unittest.cc

Issue 2897053002: [cc] Remove BeginFrameAck from BFS::DidFinishFrame and update tests. (Closed)
Patch Set: fix exo compile error Created 3 years, 7 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
« cc/scheduler/begin_frame_source.h ('K') | « cc/scheduler/begin_frame_source.cc ('k') | cc/scheduler/scheduler.cc » ('j') | cc/scheduler/scheduler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/begin_frame_source_unittest.cc
diff --git a/cc/scheduler/begin_frame_source_unittest.cc b/cc/scheduler/begin_frame_source_unittest.cc
index 4cc251df59b06f706d74fff45542e3da9ea52f50..d43bc07a781824dd1c55dbf97f62b7707db3edef 100644
--- a/cc/scheduler/begin_frame_source_unittest.cc
+++ b/cc/scheduler/begin_frame_source_unittest.cc
@@ -73,8 +73,7 @@ TEST_F(BackToBackBeginFrameSourceTest, AddObserverSendsBeginFrame) {
EXPECT_BEGIN_FRAME_USED(*obs_, source_->source_id(), 2, 1100,
1100 + kDeadline, kInterval);
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(obs_.get());
task_runner_->RunPendingTasks();
}
@@ -87,8 +86,7 @@ TEST_F(BackToBackBeginFrameSourceTest,
task_runner_->RunPendingTasks();
source_->RemoveObserver(obs_.get());
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(obs_.get());
// Verify no BeginFrame is sent to |obs_|. There is a pending task in the
// task_runner_ as a BeginFrame was posted, but it gets aborted since |obs_|
@@ -106,8 +104,7 @@ TEST_F(BackToBackBeginFrameSourceTest,
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(obs_.get());
source_->RemoveObserver(obs_.get());
EXPECT_TRUE(task_runner_->HasPendingTasks());
@@ -130,8 +127,7 @@ TEST_F(BackToBackBeginFrameSourceTest,
source_->AddObserver(obs_.get());
now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(obs_.get());
now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
// The begin frame is posted at the time when the observer was added,
@@ -151,8 +147,7 @@ TEST_F(BackToBackBeginFrameSourceTest,
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(obs_.get());
now_src_->Advance(base::TimeDelta::FromMicroseconds(10));
source_->RemoveObserver(obs_.get());
@@ -174,8 +169,7 @@ TEST_F(BackToBackBeginFrameSourceTest, DidFinishFrameNoObserver) {
EXPECT_BEGIN_FRAME_SOURCE_PAUSED(*obs_, false);
source_->AddObserver(obs_.get());
source_->RemoveObserver(obs_.get());
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(obs_.get());
EXPECT_FALSE(task_runner_->RunPendingTasks());
}
@@ -187,23 +181,17 @@ TEST_F(BackToBackBeginFrameSourceTest, DidFinishFrameMultipleCallsIdempotent) {
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(obs_.get());
+ source_->DidFinishFrame(obs_.get());
+ source_->DidFinishFrame(obs_.get());
EXPECT_BEGIN_FRAME_USED(*obs_, source_->source_id(), 2, 1100,
1100 + kDeadline, kInterval);
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 2, 2, true));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 2, 2, true));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 2, 2, true));
+ source_->DidFinishFrame(obs_.get());
+ source_->DidFinishFrame(obs_.get());
+ source_->DidFinishFrame(obs_.get());
EXPECT_BEGIN_FRAME_USED(*obs_, source_->source_id(), 3, 1200,
1200 + kDeadline, kInterval);
task_runner_->RunPendingTasks();
@@ -217,8 +205,7 @@ TEST_F(BackToBackBeginFrameSourceTest, DelayInPostedTaskProducesCorrectFrame) {
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(obs_.get(),
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(obs_.get());
now_src_->Advance(base::TimeDelta::FromMicroseconds(50));
// Ticks at the time the last frame finished, so ignores the last change to
// "now".
@@ -244,10 +231,8 @@ TEST_F(BackToBackBeginFrameSourceTest, MultipleObserversSynchronized) {
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(&obs1,
- BeginFrameAck(source_->source_id(), 1, 1, true));
- source_->DidFinishFrame(&obs2,
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(&obs1);
+ source_->DidFinishFrame(&obs2);
EXPECT_BEGIN_FRAME_USED(obs1, source_->source_id(), 2, 1100, 1100 + kDeadline,
kInterval);
EXPECT_BEGIN_FRAME_USED(obs2, source_->source_id(), 2, 1100, 1100 + kDeadline,
@@ -255,10 +240,8 @@ TEST_F(BackToBackBeginFrameSourceTest, MultipleObserversSynchronized) {
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(&obs1,
- BeginFrameAck(source_->source_id(), 2, 2, true));
- source_->DidFinishFrame(&obs2,
- BeginFrameAck(source_->source_id(), 2, 2, true));
+ source_->DidFinishFrame(&obs1);
+ source_->DidFinishFrame(&obs2);
EXPECT_TRUE(task_runner_->HasPendingTasks());
source_->RemoveObserver(&obs1);
source_->RemoveObserver(&obs2);
@@ -282,14 +265,12 @@ TEST_F(BackToBackBeginFrameSourceTest, MultipleObserversInterleaved) {
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(&obs1,
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(&obs1);
EXPECT_BEGIN_FRAME_USED(obs1, source_->source_id(), 3, 1200, 1200 + kDeadline,
kInterval);
task_runner_->RunPendingTasks();
- source_->DidFinishFrame(&obs1,
- BeginFrameAck(source_->source_id(), 3, 3, true));
+ source_->DidFinishFrame(&obs1);
source_->RemoveObserver(&obs1);
// Removing all finished observers should disable the time source.
EXPECT_FALSE(delay_based_time_source_->Active());
@@ -298,14 +279,12 @@ TEST_F(BackToBackBeginFrameSourceTest, MultipleObserversInterleaved) {
task_runner_->RunPendingTasks();
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(&obs2,
- BeginFrameAck(source_->source_id(), 2, 2, true));
+ source_->DidFinishFrame(&obs2);
EXPECT_BEGIN_FRAME_USED(obs2, source_->source_id(), 4, 1300, 1300 + kDeadline,
kInterval);
task_runner_->RunPendingTasks();
- source_->DidFinishFrame(&obs2,
- BeginFrameAck(source_->source_id(), 4, 4, true));
+ source_->DidFinishFrame(&obs2);
source_->RemoveObserver(&obs2);
}
@@ -324,13 +303,11 @@ TEST_F(BackToBackBeginFrameSourceTest, MultipleObserversAtOnce) {
// |obs1| finishes first.
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(&obs1,
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(&obs1);
// |obs2| finishes also, before getting to the newly posted begin frame.
now_src_->Advance(base::TimeDelta::FromMicroseconds(100));
- source_->DidFinishFrame(&obs2,
- BeginFrameAck(source_->source_id(), 1, 1, true));
+ source_->DidFinishFrame(&obs2);
// Because the begin frame source already ticked when |obs1| finished,
// we see it as the frame time for both observers.
@@ -340,11 +317,9 @@ TEST_F(BackToBackBeginFrameSourceTest, MultipleObserversAtOnce) {
kInterval);
task_runner_->RunPendingTasks();
- source_->DidFinishFrame(&obs1,
- BeginFrameAck(source_->source_id(), 2, 2, true));
+ source_->DidFinishFrame(&obs1);
source_->RemoveObserver(&obs1);
- source_->DidFinishFrame(&obs2,
- BeginFrameAck(source_->source_id(), 2, 2, true));
+ source_->DidFinishFrame(&obs2);
source_->RemoveObserver(&obs2);
}
« cc/scheduler/begin_frame_source.h ('K') | « cc/scheduler/begin_frame_source.cc ('k') | cc/scheduler/scheduler.cc » ('j') | cc/scheduler/scheduler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698