review

Author: Chris Yang

shell/common/animator.cc

@@ -206,8 +206,8 @@ void Animator::Render(std::unique_ptr<flutter::LayerTree> layer_tree) {
                            std::move(frame_timings_recorder_));
 }
 
-const std::shared_ptr<VsyncWaiter> Animator::GetVsyncWaiter() const {
-  return waiter_;
+const VsyncWaiter& Animator::GetVsyncWaiter() const {
+  return *waiter_.get();
 }
 
 bool Animator::CanReuseLastLayerTree() {

shell/common/animator.h

@@ -54,7 +54,7 @@ class Animator final {
 
   void Render(std::unique_ptr<flutter::LayerTree> layer_tree);
 
-  const std::shared_ptr<VsyncWaiter> GetVsyncWaiter() const;
+  const VsyncWaiter& GetVsyncWaiter() const;
 
   //--------------------------------------------------------------------------
   /// @brief    Schedule a secondary callback to be executed right after the

shell/common/engine.cc

@@ -600,7 +600,7 @@ void Engine::LoadDartDeferredLibraryError(intptr_t loading_unit_id,
   }
 }
 
-const std::shared_ptr<VsyncWaiter> Engine::GetVsyncWaiter() const {
+const VsyncWaiter& Engine::GetVsyncWaiter() const {
   return animator_->GetVsyncWaiter();
 }
 

shell/common/engine.h

@@ -903,7 +903,7 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
     return runtime_controller_.get();
   }
 
-  const std::shared_ptr<VsyncWaiter> GetVsyncWaiter() const;
+  const VsyncWaiter& GetVsyncWaiter() const;
 
  private:
   // |RuntimeDelegate|

shell/common/shell.cc

@@ -1872,7 +1872,7 @@ Shell::GetPlatformMessageHandler() const {
   return platform_message_handler_;
 }
 
-const std::shared_ptr<VsyncWaiter> Shell::GetVsyncWaiter() const {
+const VsyncWaiter& Shell::GetVsyncWaiter() const {
   return engine_->GetVsyncWaiter();
 }
 

shell/common/shell.h

@@ -401,7 +401,7 @@ class Shell final : public PlatformView::Delegate,
   const std::shared_ptr<PlatformMessageHandler>& GetPlatformMessageHandler()
       const;
 
-  const std::shared_ptr<VsyncWaiter> GetVsyncWaiter() const;
+  const VsyncWaiter& GetVsyncWaiter() const;
 
  private:
   using ServiceProtocolHandler =

shell/common/variable_refresh_rate_display.cc

@@ -9,17 +9,17 @@ namespace flutter {
 
 VariableRefreshRateDisplay::VariableRefreshRateDisplay(
     DisplayId display_id,
-    std::shared_ptr<VariableRefreshRateReporter> refresh_rate_reporter)
-    : Display(display_id, refresh_rate_reporter->GetRefreshRate()),
+    const VariableRefreshRateReporter& refresh_rate_reporter)
+    : Display(display_id, refresh_rate_reporter.GetRefreshRate()),
       refresh_rate_reporter_(refresh_rate_reporter) {}
 
 VariableRefreshRateDisplay::VariableRefreshRateDisplay(
-    std::shared_ptr<VariableRefreshRateReporter> refresh_rate_reporter)
-    : Display(refresh_rate_reporter->GetRefreshRate()),
+    const VariableRefreshRateReporter& refresh_rate_reporter)
+    : Display(refresh_rate_reporter.GetRefreshRate()),
       refresh_rate_reporter_(refresh_rate_reporter) {}
 
 double VariableRefreshRateDisplay::GetRefreshRate() const {
-  return refresh_rate_reporter_->GetRefreshRate();
+  return refresh_rate_reporter_.GetRefreshRate();
 }
 
 }  // namespace flutter

shell/common/variable_refresh_rate_display.h

@@ -18,16 +18,16 @@ class VariableRefreshRateDisplay : public Display {
  public:
   explicit VariableRefreshRateDisplay(
       DisplayId display_id,
-      std::shared_ptr<VariableRefreshRateReporter> refresh_rate_reporter);
+      const VariableRefreshRateReporter& refresh_rate_reporter);
   explicit VariableRefreshRateDisplay(
-      std::shared_ptr<VariableRefreshRateReporter> refresh_rate_reporter);
+      const VariableRefreshRateReporter& refresh_rate_reporter);
   ~VariableRefreshRateDisplay() = default;
 
   // |Display|
   double GetRefreshRate() const override;
 
  private:
-  std::shared_ptr<VariableRefreshRateReporter> refresh_rate_reporter_;
+  const VariableRefreshRateReporter& refresh_rate_reporter_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(VariableRefreshRateDisplay);
 };

shell/common/variable_refresh_rate_display_unittests.cc

@@ -12,13 +12,13 @@ namespace testing {
 
 TEST(VariableRefreshRateDisplayTest, ReportCorrectInitialRefreshRate) {
   auto refresh_rate_reporter = std::make_shared<TestRefreshRateReporter>(60);
-  auto display = flutter::VariableRefreshRateDisplay(refresh_rate_reporter);
+  auto display = flutter::VariableRefreshRateDisplay(*refresh_rate_reporter.get());
   ASSERT_EQ(display.GetRefreshRate(), 60);
 }
 
 TEST(VariableRefreshRateDisplayTest, ReportCorrectRefreshRateWhenUpdated) {
   auto refresh_rate_reporter = std::make_shared<TestRefreshRateReporter>(60);
-  auto display = flutter::VariableRefreshRateDisplay(refresh_rate_reporter);
+  auto display = flutter::VariableRefreshRateDisplay(*refresh_rate_reporter.get());
   refresh_rate_reporter->UpdateRefreshRate(30);
   ASSERT_EQ(display.GetRefreshRate(), 30);
 }

shell/platform/darwin/ios/framework/Source/FlutterEngine.mm

@@ -700,8 +700,7 @@ - (BOOL)createShell:(NSString*)entrypoint
 }
 
 - (void)initializeDisplays {
-  std::shared_ptr<flutter::VsyncWaiterIOS> vsync_waiter_ios =
-      std::static_pointer_cast<flutter::VsyncWaiterIOS>(_shell->GetVsyncWaiter());
+  const flutter::VsyncWaiterIOS& vsync_waiter_ios = static_cast<const flutter::VsyncWaiterIOS&>(_shell->GetVsyncWaiter());
   std::vector<std::unique_ptr<flutter::Display>> displays;
   displays.push_back(std::make_unique<flutter::VariableRefreshRateDisplay>(vsync_waiter_ios));
   _shell->OnDisplayUpdates(flutter::DisplayUpdateType::kStartup, std::move(displays));