revert: 7bb3df6 ~ just now, about the NotRespectVsync feature flutter#6010

fzyzcjy · fzyzcjy · commit 8c83c97a173a · 2022-10-05T19:46:36.000+08:00
diff --git a/lib/ui/dart_ui.cc b/lib/ui/dart_ui.cc
@@ -93,7 +93,7 @@ typedef CanvasPath Path;
   V(NativeStringAttribute::initSpellOutStringAttribute, 3)            \
   V(PlatformConfigurationNativeApi::DefaultRouteName, 0)              \
   V(PlatformConfigurationNativeApi::ScheduleFrame, 0)                 \
-  V(PlatformConfigurationNativeApi::LastVsyncInfo, 0)                 \
+  /*V(LastVsyncInfo::ReadToDart, 0)*/                                 \
   V(PlatformConfigurationNativeApi::PointerDataPacketStorageReadPendingAndClear, 0) \
   V(PlatformConfigurationNativeApi::Render, 1)                        \
   V(PlatformConfigurationNativeApi::UpdateSemantics, 1)               \
diff --git a/lib/ui/platform_dispatcher.dart b/lib/ui/platform_dispatcher.dart
@@ -720,16 +720,17 @@ class PlatformDispatcher {
   external static void _scheduleFrame();
 
   LastVsyncInfo lastVsyncInfo() {
-    final List<int> raw = _lastVsyncInfo();
-    return LastVsyncInfo(
-      vsyncTargetTime: Duration(microseconds: raw[0]),
-      diffDateTimeTimePoint: raw[1],
-    );
+    // final List<int> raw = _lastVsyncInfo();
+    // return LastVsyncInfo(
+    //   vsyncTargetTime: Duration(microseconds: raw[0]),
+    //   diffDateTimeTimePoint: raw[1],
+    // );
+    throw Exception('temporarily removed');
   }
 
-  // prototype, should not really name/place here
-  @FfiNative<Handle Function()>('PlatformConfigurationNativeApi::LastVsyncInfo')
-  external static List<int> _lastVsyncInfo();
+  // // prototype, should not really name/place here
+  // @FfiNative<Handle Function()>('LastVsyncInfo::ReadToDart')
+  // external static List<int> _lastVsyncInfo();
 
   static PointerDataPacket pointerDataPacketStorageReadPendingAndClear() {
     final raw = _pointerDataPacketStorageReadPendingAndClearStatic();
diff --git a/lib/ui/window/platform_configuration.cc b/lib/ui/window/platform_configuration.cc
@@ -412,14 +412,6 @@ void PlatformConfigurationNativeApi::ScheduleFrame() {
   UIDartState::Current()->platform_configuration()->client()->ScheduleFrame();
 }
 
-Dart_Handle PlatformConfigurationNativeApi::LastVsyncInfo() {
-  UIDartState::ThrowIfUIOperationsProhibited();
-  return UIDartState::Current()
-      ->platform_configuration()
-      ->client()
-      ->LastVsyncInfo();
-}
-
 Dart_Handle
 PlatformConfigurationNativeApi::PointerDataPacketStorageReadPendingAndClear() {
   UIDartState::ThrowIfUIOperationsProhibited();
diff --git a/lib/ui/window/platform_configuration.h b/lib/ui/window/platform_configuration.h
@@ -64,8 +64,6 @@ class PlatformConfigurationClient {
   ///
   virtual void ScheduleFrame() = 0;
 
-  virtual Dart_Handle LastVsyncInfo() = 0;
-
   virtual Dart_Handle PointerDataPacketStorageReadPendingAndClear() = 0;
 
   //--------------------------------------------------------------------------
@@ -477,8 +475,6 @@ class PlatformConfigurationNativeApi {
 
   static void ScheduleFrame();
 
-  static Dart_Handle LastVsyncInfo();
-
   static Dart_Handle PointerDataPacketStorageReadPendingAndClear();
 
   static void Render(Scene* scene);
diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc
@@ -279,10 +279,6 @@ void RuntimeController::ScheduleFrame() {
   client_.ScheduleFrame();
 }
 
-Dart_Handle RuntimeController::LastVsyncInfo() {
-  return client_.LastVsyncInfo();
-}
-
 Dart_Handle RuntimeController::PointerDataPacketStorageReadPendingAndClear() {
   return client_.PointerDataPacketStorageReadPendingAndClear();
 }
diff --git a/runtime/runtime_controller.h b/runtime/runtime_controller.h
@@ -604,8 +604,6 @@ class RuntimeController : public PlatformConfigurationClient {
   // |PlatformConfigurationClient|
   void ScheduleFrame() override;
 
-  Dart_Handle LastVsyncInfo() override;
-
   Dart_Handle PointerDataPacketStorageReadPendingAndClear() override;
 
   // |PlatformConfigurationClient|
diff --git a/runtime/runtime_delegate.h b/runtime/runtime_delegate.h
@@ -25,8 +25,6 @@ class RuntimeDelegate {
 
   virtual void ScheduleFrame(bool regenerate_layer_tree = true) = 0;
 
-  virtual Dart_Handle LastVsyncInfo() = 0;
-
   virtual Dart_Handle PointerDataPacketStorageReadPendingAndClear() = 0;
 
   virtual void Render(std::shared_ptr<flutter::LayerTree> layer_tree) = 0;
diff --git a/shell/common/animator.cc b/shell/common/animator.cc
@@ -5,7 +5,6 @@
 #include "flutter/shell/common/animator.h"
 
 #include "flutter/flow/frame_timings.h"
-#include "flutter/fml/backtrace.h"
 #include "flutter/fml/time/time_point.h"
 #include "flutter/fml/trace_event.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
@@ -80,7 +79,6 @@ void Animator::BeginFrame(
                          frame_request_number_);
   frame_request_number_++;
 
-  FML_DLOG(INFO) << "hi Animator::BeginFrame set frame_timings_recorder_";
   frame_timings_recorder_ = std::move(frame_timings_recorder);
   frame_timings_recorder_->RecordBuildStart(fml::TimePoint::Now());
 
@@ -172,7 +170,6 @@ void Animator::Render(std::shared_ptr<flutter::LayerTree> layer_tree) {
   last_layer_tree_size_ = layer_tree->frame_size();
 
   if (!frame_timings_recorder_) {
-    FML_DLOG(INFO) << "hi Animator::Render set frame_timings_recorder_";
     // Framework can directly call render with a built scene.
     frame_timings_recorder_ = std::make_unique<FrameTimingsRecorder>();
     const fml::TimePoint placeholder_time = fml::TimePoint::Now();
@@ -201,7 +198,6 @@ void Animator::Render(std::shared_ptr<flutter::LayerTree> layer_tree) {
   FML_DLOG(INFO) << "hi Animator::Render call producer_continuation_.Complete"
                  << " produce producer_continuation_="
                  << static_cast<bool>(producer_continuation_);
-  FML_DLOG(INFO) << "hi Animator::Render remove frame_timings_recorder_";
   auto layer_tree_item = std::make_unique<LayerTreeItem>(
       std::move(layer_tree), std::move(frame_timings_recorder_));
   // Commit the pending continuation.
@@ -290,62 +286,25 @@ void Animator::RequestFrame(bool regenerate_layer_tree) {
 
 void Animator::AwaitVSync() {
   FML_DLOG(INFO) << "hi Animator::AwaitVSync start";
-
-  // #5982
-  const LastVsyncInfo& lastVsyncInfo = LastVsyncInfo::Instance();
-  // to do: use one lock, currently two reads use two lockings.
-  auto frame_start_time = lastVsyncInfo.GetVsyncStartTime();
-  auto frame_target_time = lastVsyncInfo.GetVsyncTargetTime();
-
-  bool curr_vsync_has_already_called_begin_frame =
-      frame_timings_recorder_ &&
-      frame_timings_recorder_->GetVsyncTargetTime() == frame_target_time;
-  FML_DLOG(INFO)
-      << "hi Animator::AwaitVSync curr_vsync_has_already_called_begin_frame="
-      << curr_vsync_has_already_called_begin_frame << " frame_target_time="
-      << frame_target_time.ToEpochDelta().ToMicroseconds()
-      << " frame_timings_recorder_->GetVsyncTargetTime="
-      << (frame_timings_recorder_
-              ? frame_timings_recorder_->GetVsyncTargetTime()
-                    .ToEpochDelta()
-                    .ToMicroseconds()
-              : -1)
-      << " backtrace=" << fml::BacktraceHere();
-
-  // NotRespectVsync, see #5982
-  if (curr_vsync_has_already_called_begin_frame) {
-    waiter_
-        ->AsyncWaitForVsync(
-            [self = weak_factory_.GetWeakPtr()](
-                std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) {
-              FML_DLOG(INFO)
-                  << "hi Animator::AwaitVSync AsyncWaitForVsync callback start";
-              if (self) {
-                if (self->CanReuseLastLayerTree()) {
-                  FML_DLOG(INFO) << "hi Animator::AwaitVSync AsyncWaitForVsync "
-                                    "callback call DrawLastLayerTree";
-                  self->DrawLastLayerTree(std::move(frame_timings_recorder));
-                } else {
-                  FML_DLOG(INFO) << "hi Animator::AwaitVSync AsyncWaitForVsync "
-                                    "callback call BeginFrame";
-                  self->BeginFrame(std::move(frame_timings_recorder));
-                }
-              }
-              FML_DLOG(INFO)
-                  << "hi Animator::AwaitVSync AsyncWaitForVsync callback end";
-            });
-  } else {
-    FML_DLOG(INFO) << "hi Animator::AwaitVSync directly call BeginFrame";
-
-    // ref: vsync_waiter.cc
-    std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder =
-        std::make_unique<FrameTimingsRecorder>();
-    frame_timings_recorder->RecordVsync(frame_start_time, frame_target_time);
-
-    // hack: not consider `CanReuseLastLayerTree` yet
-    BeginFrame(std::move(frame_timings_recorder));
-  }
-
+  waiter_->AsyncWaitForVsync(
+      [self = weak_factory_.GetWeakPtr()](
+          std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) {
+        FML_DLOG(INFO)
+            << "hi Animator::AwaitVSync AsyncWaitForVsync callback start";
+        if (self) {
+          if (self->CanReuseLastLayerTree()) {
+            FML_DLOG(INFO) << "hi Animator::AwaitVSync AsyncWaitForVsync "
+                              "callback call DrawLastLayerTree";
+            self->DrawLastLayerTree(std::move(frame_timings_recorder));
+          } else {
+            FML_DLOG(INFO) << "hi Animator::AwaitVSync AsyncWaitForVsync "
+                              "callback call BeginFrame";
+            self->BeginFrame(std::move(frame_timings_recorder));
+          }
+        }
+        FML_DLOG(INFO)
+            << "hi Animator::AwaitVSync AsyncWaitForVsync callback end";
+      });
   if (has_rendered_) {
     delegate_.OnAnimatorNotifyIdle(dart_frame_deadline_);
   }
diff --git a/shell/common/engine.cc b/shell/common/engine.cc
@@ -439,10 +439,6 @@ void Engine::ScheduleFrame(bool regenerate_layer_tree) {
   animator_->RequestFrame(regenerate_layer_tree);
 }
 
-Dart_Handle Engine::LastVsyncInfo() {
-  return LastVsyncInfo::ReadToDart();
-}
-
 Dart_Handle Engine::PointerDataPacketStorageReadPendingAndClear() {
   return PointerDataPacketStorage::ReadPendingAndClearStatic();
 }
diff --git a/shell/common/engine.h b/shell/common/engine.h
@@ -755,9 +755,6 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   // |RuntimeDelegate|
   void ScheduleFrame(bool regenerate_layer_tree) override;
 
-  // |RuntimeDelegate|
-  Dart_Handle LastVsyncInfo() override;
-
   // |RuntimeDelegate|
   Dart_Handle PointerDataPacketStorageReadPendingAndClear() override;
 
diff --git a/shell/common/engine_unittests.cc b/shell/common/engine_unittests.cc
@@ -50,7 +50,6 @@ class MockRuntimeDelegate : public RuntimeDelegate {
  public:
   MOCK_METHOD0(DefaultRouteName, std::string());
   MOCK_METHOD1(ScheduleFrame, void(bool));
-  MOCK_METHOD0(LastVsyncInfo, Dart_Handle());
   MOCK_METHOD0(PointerDataPacketStorageReadPendingAndClear, Dart_Handle());
   MOCK_METHOD1(Render, void(std::shared_ptr<flutter::LayerTree>));
   MOCK_METHOD2(UpdateSemantics,
diff --git a/shell/common/vsync_waiter.cc b/shell/common/vsync_waiter.cc
@@ -71,6 +71,10 @@ LastVsyncInfo& LastVsyncInfo::Instance() {
 }
 
 Dart_Handle LastVsyncInfo::ReadToDart() {
+  // https://github.com/fzyzcjy/flutter_smooth/issues/38#issuecomment-1262271851
+  FML_LOG(ERROR) << "LastVsyncInfo::ReadToDart is temporarily disabled!";
+  abort();
+
   LastVsyncInfo& instance = Instance();
   auto vsync_target_time = instance.GetVsyncTargetTime();
   auto diff_date_time_time_point = instance.GetDiffDateTimeTimePoint();
@@ -186,6 +190,9 @@ void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
   // #5835
   LastVsyncInfo::Instance().RecordVsync(frame_start_time, frame_target_time);
 
+  // temporarily disable this
+  // https://github.com/fzyzcjy/flutter_smooth/issues/38#issuecomment-1262271851
+  /*
   // hack: schedule immediately to ensure [LastVsyncInfo] is updated every 16ms
   // in real implementation, will instead have real start/pause mechanism
   // instead of such blindly refresh
@@ -198,23 +205,12 @@ void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
   //                    "ensure every frame we see info";
   // NOTE must be *after* checking empty and early return
   //      for that, see #5835
-  task_runners_.GetPlatformTaskRunner()->PostDelayedTask(
-      // hack: should not capture [this]
-      [this]() {
-        ScheduleSecondaryCallback(
-            reinterpret_cast<uintptr_t>(&LastVsyncInfo::Instance()), [] {},
-            // NOTE do NOT sanity check thread, since closure is empty and we
-            // only want to trigger scheduling
-            false);
-      },
-      // NOTE try to use a *delayed* task, because if immediately call
-      //      [ScheduleSecondaryCallback], have seen one vsync fire *multi*
-      //      callbacks which is totally wrong
-      fml::TimeDelta::FromMilliseconds(1));
-
-  // for debug #5988
-  fml::tracing::TraceEventAsyncComplete("flutter", "VsyncStartToTarget",
-                                        frame_start_time, frame_target_time);
+  ScheduleSecondaryCallback(
+      reinterpret_cast<uintptr_t>(&LastVsyncInfo::Instance()), [] {},
+      // NOTE do NOT sanity check thread, since closure is empty and we only
+      // want to trigger scheduling
+      false);
+  */
 
   if (callback) {
     auto flow_identifier = fml::tracing::TraceNonce();

Original file line number	Diff line number	Diff line change
`@@ -279,10 +279,6 @@ void RuntimeController::ScheduleFrame() {`
`279`	`279`	`client_.ScheduleFrame();`
`280`	`280`	`}`
`281`	`281`
`282`		`-Dart_Handle RuntimeController::LastVsyncInfo() {`
`283`		`- return client_.LastVsyncInfo();`
`284`		`-}`
`285`		`-`
`286`	`282`	`Dart_Handle RuntimeController::PointerDataPacketStorageReadPendingAndClear() {`
`287`	`283`	`return client_.PointerDataPacketStorageReadPendingAndClear();`
`288`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -439,10 +439,6 @@ void Engine::ScheduleFrame(bool regenerate_layer_tree) {`
`439`	`439`	`animator_->RequestFrame(regenerate_layer_tree);`
`440`	`440`	`}`
`441`	`441`
`442`		`-Dart_Handle Engine::LastVsyncInfo() {`
`443`		`- return LastVsyncInfo::ReadToDart();`
`444`		`-}`
`445`		`-`
`446`	`442`	`Dart_Handle Engine::PointerDataPacketStorageReadPendingAndClear() {`
`447`	`443`	`return PointerDataPacketStorage::ReadPendingAndClearStatic();`
`448`	`444`	`}`