From f743e226e7c21aec0a70669fe4ad564686cfaa77 Mon Sep 17 00:00:00 2001
From: chaopeng <chaopeng@google.com>
Date: Thu, 7 Nov 2024 11:22:00 -0500
Subject: [PATCH] [fuchsia] MaybeRunInitialVsyncCallback should only called
 once

Currently, flutter keeps calling MaybeRunInitialVsyncCallback() until 1
OnNextFrameBegin() called from Fuchsia which maybe problem when display
is off.

Bug: http://fxbug.dev/376079469
---
 .../fuchsia/flutter/flatland_connection.cc     | 18 +++++++++---------
 .../fuchsia/flutter/flatland_connection.h      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/shell/platform/fuchsia/flutter/flatland_connection.cc b/shell/platform/fuchsia/flutter/flatland_connection.cc
index 6a0b6dd22dc1b..7a6cdada396d4 100644
--- a/shell/platform/fuchsia/flutter/flatland_connection.cc
+++ b/shell/platform/fuchsia/flutter/flatland_connection.cc
@@ -222,7 +222,6 @@ void FlatlandConnection::OnNextFrameBegin(
   const auto now = fml::TimePoint::Now();
 
   std::scoped_lock<std::mutex> lock(threadsafe_state_.mutex_);
-  threadsafe_state_.first_feedback_received_ = true;
   threadsafe_state_.present_credits_ += values.additional_present_credits();
   TRACE_DURATION("flutter", "FlatlandConnection::OnNextFrameBegin",
                  "present_credits", threadsafe_state_.present_credits_);
@@ -319,15 +318,16 @@ fml::TimePoint FlatlandConnection::GetNextPresentationTime(
 bool FlatlandConnection::MaybeRunInitialVsyncCallback(
     const fml::TimePoint& now,
     FireCallbackCallback& callback) {
-  if (!threadsafe_state_.first_feedback_received_) {
-    TRACE_DURATION("flutter",
-                   "FlatlandConnection::MaybeRunInitialVsyncCallback");
-    const auto frame_end = now + kInitialFlatlandVsyncOffset;
-    threadsafe_state_.last_presentation_time_ = frame_end;
-    callback(now, frame_end);
-    return true;
+  // Only sent maybe_run_initial_vsync once.
+  if (threadsafe_state_.maybe_run_initial_vsync_callback_sent_) {
+    return false;
   }
-  return false;
+  TRACE_DURATION("flutter", "FlatlandConnection::MaybeRunInitialVsyncCallback");
+  const auto frame_end = now + kInitialFlatlandVsyncOffset;
+  threadsafe_state_.last_presentation_time_ = frame_end;
+  threadsafe_state_.maybe_run_initial_vsync_callback_sent_ = true;
+  callback(now, frame_end);
+  return true;
 }
 
 // This method may be called from the raster or UI thread, but it is safe
diff --git a/shell/platform/fuchsia/flutter/flatland_connection.h b/shell/platform/fuchsia/flutter/flatland_connection.h
index 37cb47bd05e69..86d0c063a3d68 100644
--- a/shell/platform/fuchsia/flutter/flatland_connection.h
+++ b/shell/platform/fuchsia/flutter/flatland_connection.h
@@ -137,7 +137,7 @@ class FlatlandConnection final {
     fml::TimePoint last_presentation_time_;
     FireCallbackCallback pending_fire_callback_;
     uint32_t present_credits_ = 1;
-    bool first_feedback_received_ = false;
+    bool maybe_run_initial_vsync_callback_sent_ = false;
   } threadsafe_state_;
 
   // Acquire fences sent to Flatland.