cleanup

Author: Chris Yang

lib/ui/compositing/scene_builder_unittests.cc

@@ -78,6 +78,7 @@ TEST_F(ShellTest, SceneBuilderBuildAndSceneDisposeReleasesLayerStack) {
   AddNativeCallback("CaptureScene", CREATE_NATIVE_ENTRY(capture_scene));
   AddNativeCallback("ValidateSceneHasNoLayers",
                     CREATE_NATIVE_ENTRY(validate_scene_has_no_layers));
+
   std::unique_ptr<Shell> shell =
       CreateShell(std::move(settings), std::move(task_runners));
 

shell/common/animator.cc

@@ -41,7 +41,6 @@ Animator::Animator(Delegate& delegate,
 #endif  // SHELL_ENABLE_METAL
       pending_frame_semaphore_(1),
       weak_factory_(this) {
-  // waiter->SetDelegate(weak_factory_.GetWeakPtr());
 }
 
 Animator::~Animator() = default;
@@ -65,11 +64,6 @@ void Animator::SetDimensionChangePending() {
   dimension_change_pending_ = true;
 }
 
-// |VsycnWaiter::Delegate|
-void Animator::OnReportNewFrameRate(double new_frame_rate) {
-  FML_DLOG(ERROR) << "Animator::new frame rate " << new_frame_rate;
-}
-
 void Animator::EnqueueTraceFlowId(uint64_t trace_flow_id) {
   fml::TaskRunner::RunNowOrPostTask(
       task_runners_.GetUITaskRunner(),

shell/common/animator.h

@@ -27,7 +27,7 @@ class ShellTest;
 ///
 /// In conjunction with the |VsyncWaiter| it allows callers (typically Dart
 /// code) to schedule work that ends up generating a |LayerTree|.
-class Animator final : public VsyncWaiter::Delegate {
+class Animator final {
  public:
   class Delegate {
    public:
@@ -84,9 +84,6 @@ class Animator final : public VsyncWaiter::Delegate {
   // active rendering.
   void EnqueueTraceFlowId(uint64_t trace_flow_id);
 
-  // |VsycnWaiter::Delegate|
-  void OnReportNewFrameRate(double new_frame_rate) override;
-
  private:
   using LayerTreePipeline = Pipeline<flutter::LayerTree>;
 

shell/common/animator_unittests.cc

@@ -163,6 +163,7 @@ TEST_F(ShellTest, AnimatorDoesNotNotifyIdleBeforeRender) {
     } while (ui_latch.WaitWithTimeout(fml::TimeDelta::FromMilliseconds(1)));
     latch.Signal();
   };
+
   // Create the animator on the UI task runner.
   task_runners.GetUITaskRunner()->PostTask([&] {
     auto vsync_waiter = static_cast<std::unique_ptr<VsyncWaiter>>(

shell/common/platform_view.cc

@@ -25,7 +25,7 @@ std::unique_ptr<VsyncWaiter> PlatformView::CreateVSyncWaiter() {
   FML_DLOG(WARNING)
       << "This platform does not provide a Vsync waiter implementation. A "
          "simple timer based fallback is being used.";
-  return std::make_unique<VsyncWaiterFallback>(task_runners_, false);
+  return std::make_unique<VsyncWaiterFallback>(task_runners_);
 }
 
 void PlatformView::DispatchPlatformMessage(

shell/common/vsync_waiter.cc

@@ -94,10 +94,6 @@ void VsyncWaiter::ScheduleSecondaryCallback(uintptr_t id,
   AwaitVSyncForSecondaryCallback();
 }
 
-void VsyncWaiter::SetDelegate(fml::WeakPtr<Delegate> delegate) {
-  delegate_ = std::move(delegate);
-}
-
 void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
                                fml::TimePoint frame_target_time,
                                bool pause_secondary_tasks) {
@@ -173,4 +169,5 @@ void VsyncWaiter::ResumeDartMicroTasks(fml::TaskQueueId ui_task_queue_id) {
   auto task_queues = fml::MessageLoopTaskQueues::GetInstance();
   task_queues->ResumeSecondarySource(ui_task_queue_id);
 }
+
 }  // namespace flutter

shell/common/vsync_waiter.h

@@ -20,11 +20,6 @@ namespace flutter {
 /// getting callbacks when a vsync event happens.
 class VsyncWaiter : public std::enable_shared_from_this<VsyncWaiter> {
  public:
-  class Delegate {
-   public:
-    virtual void OnReportNewFrameRate(double new_frame_rate) = 0;
-  };
-
   using Callback = std::function<void(std::unique_ptr<FrameTimingsRecorder>)>;
 
   virtual ~VsyncWaiter();
@@ -37,8 +32,6 @@ class VsyncWaiter : public std::enable_shared_from_this<VsyncWaiter> {
   /// |Animator::ScheduleMaybeClearTraceFlowIds|.
   void ScheduleSecondaryCallback(uintptr_t id, const fml::closure& callback);
 
-  void SetDelegate(fml::WeakPtr<Delegate> delegate);
-
  protected:
   // On some backends, the |FireCallback| needs to be made from a static C
   // method.
@@ -82,7 +75,6 @@ class VsyncWaiter : public std::enable_shared_from_this<VsyncWaiter> {
   std::mutex callback_mutex_;
   Callback callback_;
   std::unordered_map<uintptr_t, fml::closure> secondary_callbacks_;
-  fml::WeakPtr<Delegate> delegate_;
   double frame_rate_ = -1;
 
   void PauseDartMicroTasks();

shell/common/vsync_waiters_test.cc

@@ -64,9 +64,5 @@ void ConstantFiringVsyncWaiter::AwaitVSync() {
   });
 }
 
-void TestVsyncWaiterDelegate::OnReportNewFrameRate(double new_frame_rate) {
-  FML_DLOG(ERROR) << "new frame rate " << new_frame_rate;
-}
-
 }  // namespace testing
 }  // namespace flutter

shell/common/vsync_waiters_test.h

@@ -56,11 +56,6 @@ class ConstantFiringVsyncWaiter : public VsyncWaiter {
   void AwaitVSync() override;
 };
 
-class TestVsyncWaiterDelegate : public VsyncWaiter::Delegate {
-  // |VsycnWaiter::Delegate|
-  void OnReportNewFrameRate(double new_frame_rate) override;
-};
-
 }  // namespace testing
 }  // namespace flutter
 

shell/platform/android/vsync_waiter_android.cc

@@ -19,7 +19,7 @@ namespace flutter {
 static fml::jni::ScopedJavaGlobalRef<jclass>* g_vsync_waiter_class = nullptr;
 static jmethodID g_async_wait_for_vsync_method_ = nullptr;
 
-VsyncWaiterAndroid::VsyncWaiterAndroid(flutter::TaskRunners task_runners, )
+VsyncWaiterAndroid::VsyncWaiterAndroid(flutter::TaskRunners task_runners)
     : VsyncWaiter(std::move(task_runners)) {}
 
 VsyncWaiterAndroid::~VsyncWaiterAndroid() = default;