Fold BeginFrameSource::SetClientReady into AddObserver

As a part of https://codereview.chromium.org/1774323003, it became clear
that it needed to be possible to call SetClientReady repeatedly, which
some sources didn't support.

Instead of just making that part of the contract, instead fold the two
places where SetClientReady mattered into AddObserver (the first time
where a begin frame could actually be delivered) and remove
SetClientReady from the API.

R=skyostil@chromium.org,sunnyps@chomium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1778853003

Cr-Commit-Position: refs/heads/master@{#381612}

6 files changed, 0 insertions, 19 deletions

diff --git a/cc/scheduler/begin_frame_source.h b/cc/scheduler/begin_frame_source.h
index 6815d42..1efd6a1 100644
--- a/cc/scheduler/begin_frame_source.h
+++ b/cc/scheduler/begin_frame_source.h
@@ -126,9 +126,6 @@ class CC_EXPORT BeginFrameSource {
   virtual void AddObserver(BeginFrameObserver* obs) = 0;
   virtual void RemoveObserver(BeginFrameObserver* obs) = 0;
 
-  // Tells the Source that client is ready to handle BeginFrames messages.
-  virtual void SetClientReady() = 0;
-
   // Tracing support - Recommend (but not required) to call this implementation
   // in any override.
   virtual void AsValueInto(base::trace_event::TracedValue* dict) const = 0;
@@ -149,7 +146,6 @@ class CC_EXPORT BeginFrameSourceBase : public BeginFrameSource {
   void DidFinishFrame(size_t remaining_frames) override {}
   void AddObserver(BeginFrameObserver* obs) override;
   void RemoveObserver(BeginFrameObserver* obs) override;
-  void SetClientReady() override {}
 
   // Tracing support - Recommend (but not required) to call this implementation
   // in any override.
diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
index ca36c1e..f5c6d60 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -68,7 +68,6 @@ Scheduler::Scheduler(
   begin_impl_frame_deadline_closure_ = base::Bind(
       &Scheduler::OnBeginImplFrameDeadline, weak_factory_.GetWeakPtr());
 
-  begin_frame_source_->SetClientReady();
   ProcessScheduledActions();
 }
 
diff --git a/cc/surfaces/surface_manager_unittest.cc b/cc/surfaces/surface_manager_unittest.cc
index 9e9ff23..7770d7f 100644
--- a/cc/surfaces/surface_manager_unittest.cc
+++ b/cc/surfaces/surface_manager_unittest.cc
@@ -61,7 +61,6 @@ class EmptyBeginFrameSource : public BeginFrameSource {
   void DidFinishFrame(size_t remaining_frames) override{};
   void AddObserver(BeginFrameObserver* obs) override{};
   void RemoveObserver(BeginFrameObserver* obs) override{};
-  void SetClientReady() override {}
   void AsValueInto(base::trace_event::TracedValue* dict) const override{};
 };
 
diff --git a/cc/test/fake_external_begin_frame_source.cc b/cc/test/fake_external_begin_frame_source.cc
index 1875bdb..fee842b 100644
--- a/cc/test/fake_external_begin_frame_source.cc
+++ b/cc/test/fake_external_begin_frame_source.cc
@@ -14,7 +14,6 @@ namespace cc {
 
 FakeExternalBeginFrameSource::FakeExternalBeginFrameSource(double refresh_rate)
     : milliseconds_per_frame_(1000.0 / refresh_rate),
-      is_ready_(false),
       weak_ptr_factory_(this) {
   DetachFromThread();
 }
@@ -23,11 +22,6 @@ FakeExternalBeginFrameSource::~FakeExternalBeginFrameSource() {
   DCHECK(CalledOnValidThread());
 }
 
-void FakeExternalBeginFrameSource::SetClientReady() {
-  DCHECK(CalledOnValidThread());
-  is_ready_ = true;
-}
-
 void FakeExternalBeginFrameSource::OnNeedsBeginFramesChanged(
     bool needs_begin_frames) {
   DCHECK(CalledOnValidThread());
diff --git a/cc/test/fake_external_begin_frame_source.h b/cc/test/fake_external_begin_frame_source.h
index 99dbf56..1653dec 100644
--- a/cc/test/fake_external_begin_frame_source.h
+++ b/cc/test/fake_external_begin_frame_source.h
@@ -17,11 +17,6 @@ class FakeExternalBeginFrameSource
   explicit FakeExternalBeginFrameSource(double refresh_rate);
   ~FakeExternalBeginFrameSource() override;
 
-  bool is_ready() const { return is_ready_; }
-
-  // BeginFrameSource implementation.
-  void SetClientReady() override;
-
   // BeginFrameSourceBase overrides.
   void OnNeedsBeginFramesChanged(bool needs_begin_frames) override;
 
@@ -30,7 +25,6 @@ class FakeExternalBeginFrameSource
 
  private:
   double milliseconds_per_frame_;
-  bool is_ready_;
   base::CancelableClosure begin_frame_task_;
   base::WeakPtrFactory<FakeExternalBeginFrameSource> weak_ptr_factory_;
 };
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 6150f5b..ca6e54d 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -914,7 +914,6 @@ scoped_ptr<OutputSurface> LayerTreeTest::CreateOutputSurface() {
   if (settings_.use_external_begin_frame_source &&
       settings_.wait_for_beginframe_interval) {
     DCHECK(external_begin_frame_source_);
-    DCHECK(external_begin_frame_source_->is_ready());
   }
   return std::move(output_surface);
 }