[cc] Remove remaining_frames from BeginFrameAck.

cc/scheduler/scheduler_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/scheduler/scheduler.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 2850 matching lines @@
   SetUpScheduler(EXTERNAL_BFS);
 
   // Expect the last ack to be for last BeginFrame, which didn't cause damage.
   uint64_t last_begin_frame_number =
       fake_external_begin_frame_source_->next_begin_frame_number() - 1;
   uint64_t latest_confirmed_sequence_number = last_begin_frame_number;
   bool has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(fake_external_begin_frame_source_->source_id(),
                     last_begin_frame_number, latest_confirmed_sequence_number,
-                    0, has_damage),
+                    has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 
   scheduler_->SetNeedsBeginMainFrame();
   EXPECT_SINGLE_ACTION("AddObserver(this)", client_);
   client_->Reset();
 
   // Next vsync.
   BeginFrameArgs args = SendNextBeginFrame();
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2);
   EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client_, 1, 2);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
   has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 
   scheduler_->NotifyBeginMainFrameStarted(base::TimeTicks());
   EXPECT_NO_ACTION(client_);
 
   // Next vsync.
   args = SendNextBeginFrame();
   EXPECT_SINGLE_ACTION("WillBeginImplFrame", client_);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
   has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 
   scheduler_->NotifyReadyToCommit();
   EXPECT_SINGLE_ACTION("ScheduledActionCommit", client_);
   client_->Reset();
 
   scheduler_->NotifyReadyToActivate();
   EXPECT_SINGLE_ACTION("ScheduledActionActivateSyncTree", client_);
   client_->Reset();
 
   // Next vsync.
   args = SendNextBeginFrame();
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2);
   EXPECT_ACTION("ScheduledActionInvalidateCompositorFrameSink", client_, 1, 2);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
   // Not confirmed yet and no damage, since not drawn yet.
   // TODO(eseckler): In the future, |has_damage = false| will prevent us from
   // filtering this ack (in CompositorExternalBeginFrameSource) and instead
   // forwarding the one attached to the later submitted CompositorFrame.
   has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 
   // Android onDraw.
   scheduler_->SetNeedsRedraw();
   bool resourceless_software_draw = false;
   scheduler_->OnDrawForCompositorFrameSink(resourceless_software_draw);
   EXPECT_SINGLE_ACTION("ScheduledActionDrawIfPossible", client_);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
   // Idle on next vsync.
   args = SendNextBeginFrame();
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 3);
   EXPECT_ACTION("RemoveObserver(this)", client_, 1, 3);
   EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 2, 3);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
   latest_confirmed_sequence_number = args.sequence_number;
   has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 TEST_F(SchedulerTest, SynchronousCompositorDoubleCommitWithoutDraw) {
   scheduler_settings_.using_synchronous_renderer_compositor = true;
   SetUpScheduler(EXTERNAL_BFS);
 
   scheduler_->SetNeedsBeginMainFrame();
   EXPECT_SINGLE_ACTION("AddObserver(this)", client_);
   client_->Reset();
@@ skipping 417 matching lines @@
   SetUpScheduler(EXTERNAL_BFS);
 
   // Expect the last ack to be for last BeginFrame, which didn't cause damage.
   uint64_t last_begin_frame_number =
       fake_external_begin_frame_source_->next_begin_frame_number() - 1;
   uint64_t latest_confirmed_sequence_number = last_begin_frame_number;
   bool has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(fake_external_begin_frame_source_->source_id(),
                     last_begin_frame_number, latest_confirmed_sequence_number,
-                    0, has_damage),
+                    has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 
   // Run a successful redraw and verify that a new ack is sent.
   scheduler_->SetNeedsRedraw();
   client_->Reset();
 
   BeginFrameArgs args = SendNextBeginFrame();
   EXPECT_LT(latest_confirmed_sequence_number, args.sequence_number);
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 1);
   EXPECT_TRUE(client_->IsInsideBeginImplFrame());
   EXPECT_TRUE(scheduler_->begin_frames_expected());
   client_->Reset();
 
   task_runner().RunPendingTasks();  // Run posted deadline.
   EXPECT_ACTION("ScheduledActionDrawIfPossible", client_, 0, 1);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   EXPECT_TRUE(scheduler_->begin_frames_expected());
   client_->Reset();
 
   // Successful draw caused damage.
   latest_confirmed_sequence_number = args.sequence_number;
   has_damage = true;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 
   // Request another redraw, but fail it. Verify that a new ack is sent, but
   // that its |latest_confirmed_sequence_number| didn't change.
   scheduler_->SetNeedsRedraw();
   client_->Reset();
 
   args = SendNextBeginFrame();
   EXPECT_LT(latest_confirmed_sequence_number, args.sequence_number);
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 1);
   EXPECT_TRUE(client_->IsInsideBeginImplFrame());
   EXPECT_TRUE(scheduler_->begin_frames_expected());
   client_->Reset();
 
   client_->SetDrawWillHappen(false);
   task_runner().RunPendingTasks();  // Run posted deadline.
   EXPECT_ACTION("ScheduledActionDrawIfPossible", client_, 0, 2);
   // Failed draw triggers SendBeginMainFrame.
   EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client_, 1, 2);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   EXPECT_TRUE(scheduler_->begin_frames_expected());
   client_->Reset();
 
   // Failed draw: no damage and unconfirmed frame.
   has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 TEST_F(SchedulerTest, BeginFrameAckForSkippedImplFrame) {
   SetUpScheduler(EXTERNAL_BFS);
 
   // To get into a high latency state, this test disables automatic swap acks.
   client_->SetAutomaticSubmitCompositorFrameAck(false);
   fake_compositor_timing_history_->SetAllEstimatesTo(kFastDuration);
 
@@ skipping 12 matching lines @@
   EXPECT_ACTION("ScheduledActionDrawIfPossible", client_, 0, 1);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   EXPECT_TRUE(scheduler_->begin_frames_expected());
   client_->Reset();
 
   // Successful draw caused damage.
   uint64_t latest_confirmed_sequence_number = args.sequence_number;
   bool has_damage = true;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 
   // Request another redraw that will be skipped because the swap ack is still
   // missing. Verify that a new BeginFrameAck is sent.
   scheduler_->SetNeedsRedraw();
   client_->Reset();
 
   args = SendNextBeginFrame();
   EXPECT_LT(latest_confirmed_sequence_number, args.sequence_number);
   EXPECT_NO_ACTION(client_);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   EXPECT_TRUE(scheduler_->begin_frames_expected());
   client_->Reset();
 
   // Skipped draw: no damage and unconfirmed frame.
   has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 TEST_F(SchedulerTest, BeginFrameAckForBeginFrameBeforeLastDeadline) {
   SetUpScheduler(EXTERNAL_BFS);
 
   // Request tile preparation to schedule a proactive BeginFrame.
   scheduler_->SetNeedsPrepareTiles();
   client_->Reset();
 
@@ skipping 16 matching lines @@
   EXPECT_FALSE(scheduler_->begin_frames_expected());
   client_->Reset();
 
   // Latest ack should be for the dropped BeginFrame. Since we don't have
   // further updates, its |latest_confirmed_sequence_number| should be for the
   // dropped BeginFrame, too.
   uint64_t latest_confirmed_sequence_number = args.sequence_number;
   bool has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 TEST_F(SchedulerTest, BeginFrameAckForDroppedBeginFrame) {
   SetUpScheduler(EXTERNAL_BFS);
 
   // Last confirmed frame was last BeginFrame.
   uint64_t latest_confirmed_sequence_number =
       fake_external_begin_frame_source_->next_begin_frame_number() - 1;
 
@@ skipping 16 matching lines @@
   // The BeginFrame should be dropped immediately, since the state machine is
   // not expecting any BeginFrames.
   BeginFrameArgs second_args = SendNextBeginFrame();
   EXPECT_NO_ACTION(client_);
   client_->Reset();
 
   // Latest ack should be for the dropped (and unconfirmed) BeginFrame.
   bool has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(second_args.source_id, second_args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 
   task_runner().RunPendingTasks();  // Run deadline of prior BeginFrame.
   EXPECT_ACTION("RemoveObserver(this)", client_, 0, 2);
   EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 1, 2);
   client_->Reset();
 
   // We'd expect an out-of-order ack for the prior BeginFrame, confirming it.
   latest_confirmed_sequence_number = first_args.sequence_number;
   has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(first_args.source_id, first_args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 TEST_F(SchedulerTest, BeginFrameAckForLateMissedBeginFrame) {
   SetUpScheduler(EXTERNAL_BFS);
 
   // Last confirmed frame was last BeginFrame.
   uint64_t latest_confirmed_sequence_number =
       fake_external_begin_frame_source_->next_begin_frame_number() - 1;
 
@@ skipping 11 matching lines @@
 
   EXPECT_NO_ACTION(client_);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
   // Latest ack should be for the missed BeginFrame that was too late: no damage
   // and unconfirmed frame.
   bool has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 TEST_F(SchedulerTest, BeginFrameAckForFinishedBeginFrameWithNewSourceId) {
   SetUpScheduler(EXTERNAL_BFS);
 
   scheduler_->SetNeedsRedraw();
   client_->Reset();
 
   // Send a BeginFrame with a different source_id.
@@ skipping 12 matching lines @@
   EXPECT_ACTION("ScheduledActionDrawIfPossible", client_, 0, 1);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   EXPECT_TRUE(scheduler_->begin_frames_expected());
   client_->Reset();
 
   // Successful draw caused damage.
   uint64_t latest_confirmed_sequence_number = args.sequence_number;
   bool has_damage = true;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 TEST_F(SchedulerTest,
        BeginFrameAckForLateMissedBeginFrameWithDifferentSourceId) {
   SetUpScheduler(EXTERNAL_BFS);
 
   scheduler_->SetNeedsRedraw();
   client_->Reset();
 
@@ skipping 12 matching lines @@
   client_->Reset();
 
   // Latest ack should be for the missed BeginFrame that was too late: no damage
   // and unconfirmed frame. Because the source_id changed, the
   // |latest_confirmed_sequence_number| should be set to invalid.
   uint64_t latest_confirmed_sequence_number =
       BeginFrameArgs::kInvalidFrameNumber;
   bool has_damage = false;
   EXPECT_EQ(
       BeginFrameAck(args.source_id, args.sequence_number,
-                    latest_confirmed_sequence_number, 0, has_damage),
+                    latest_confirmed_sequence_number, has_damage),
       fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 }  // namespace
 }  // namespace cc