[cc] Adds source_id and sequence_number to BeginFrameArgs.

cc/surfaces/display_scheduler_unittest.cc

 // Copyright 2015 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/surfaces/display_scheduler.h"
 
 #include "base/logging.h"
 #include "base/test/null_task_runner.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 55 matching lines @@
   }
 
  protected:
   int scheduler_begin_frame_deadline_count_;
 };
 
 class DisplaySchedulerTest : public testing::Test {
  public:
   DisplaySchedulerTest()
       : fake_begin_frame_source_(0.f, false),
+        next_begin_frame_number_(BeginFrameArgs::kStartingFrameNumber),
         task_runner_(new base::NullTaskRunner),
         scheduler_(&fake_begin_frame_source_,
                    task_runner_.get(),
                    kMaxPendingSwaps) {
     now_src_.Advance(base::TimeDelta::FromMicroseconds(10000));
     scheduler_.SetClient(&client_);
   }
 
   ~DisplaySchedulerTest() override {}
 
   void SetUp() override { scheduler_.SetRootSurfaceResourcesLocked(false); }
 
   void BeginFrameForTest() {
     base::TimeTicks frame_time = now_src_.NowTicks();
     base::TimeDelta interval = BeginFrameArgs::DefaultInterval();
     base::TimeTicks deadline = frame_time + interval;
-    fake_begin_frame_source_.TestOnBeginFrame(
-        BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, deadline,
-                               interval, BeginFrameArgs::NORMAL));
+    fake_begin_frame_source_.TestOnBeginFrame(BeginFrameArgs::Create(
+        BEGINFRAME_FROM_HERE, fake_begin_frame_source_.source_id(),
+        next_begin_frame_number_++, frame_time, deadline, interval,
+        BeginFrameArgs::NORMAL));
   }
 
  protected:
   base::SimpleTestTickClock& now_src() { return now_src_; }
   FakeDisplaySchedulerClient& client() { return client_; }
   DisplayScheduler& scheduler() { return scheduler_; }
 
   FakeExternalBeginFrameSource fake_begin_frame_source_;
+  uint64_t next_begin_frame_number_;

[brianderson, 2016/12/15 22:10:33]

In this case, does it make sense for this to be tracked by the
FakeExternalBeginFrameSource?

[Eric Seckler, 2016/12/16 17:25:58]

true, that's nicer :) Done.

 
   base::SimpleTestTickClock now_src_;
   scoped_refptr<base::NullTaskRunner> task_runner_;
   FakeDisplaySchedulerClient client_;
   TestDisplayScheduler scheduler_;
 };
 
 TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
   SurfaceId root_surface_id1(kArbitraryFrameSinkId,
                              LocalFrameId(1, base::UnguessableToken::Create()));
@@ skipping 457 matching lines @@
 
   scheduler_.SetRootSurfaceResourcesLocked(true);
   EXPECT_EQ(++count, scheduler_.scheduler_begin_frame_deadline_count());
 
   scheduler_.OutputSurfaceLost();
   EXPECT_EQ(++count, scheduler_.scheduler_begin_frame_deadline_count());
 }
 
 }  // namespace
 }  // namespace cc