From 36e5db44b5209d61d45c20d8276e1d8ac17eae00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A2=E9=B9=8F?= <chaopeng@google.com>
Date: Fri, 15 Nov 2024 14:05:06 -0500
Subject: [PATCH 1/2] [fuchsia] MaybeRunInitialVsyncCallback should only called
 once (#56429)

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

Tested manually.

Bug: http://fxbug.dev/376079469

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I added new tests to check the change I am making or feature I am
adding, or the PR is [test-exempt]. See [testing the engine] for
instructions on writing and running engine tests.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [x] All existing and new tests are passing.
---
 .../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..0973a7846a86a 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_.initial_vsync_callback_ran_) {
+    return false;
   }
-  return false;
+  TRACE_DURATION("flutter", "FlatlandConnection::MaybeRunInitialVsyncCallback");
+  const auto frame_end = now + kInitialFlatlandVsyncOffset;
+  threadsafe_state_.last_presentation_time_ = frame_end;
+  threadsafe_state_.initial_vsync_callback_ran_ = 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..e41c945f7fd66 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 initial_vsync_callback_ran_ = false;
   } threadsafe_state_;
 
   // Acquire fences sent to Flatland.

From 8ae4cf8cff0f7ca5e8f292f0380f1f1607cd1a78 Mon Sep 17 00:00:00 2001
From: Jonny Wang <jonnywang@google.com>
Date: Fri, 15 Nov 2024 20:12:42 +0000
Subject: [PATCH 2/2] Change CI regex to match fXX (from rXX)

---
 .ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci.yaml b/.ci.yaml
index 205edfe43306c..ea831018b5d7b 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -8,7 +8,7 @@
 enabled_branches:
   - main
   - flutter-\d+\.\d+-candidate\.\d+
-  - fuchsia_r\d+[a-z]*
+  - fuchsia_f\d+[a-z]*
 
 platform_properties:
   linux: