commit 9cf107b190c141b1391a5c9ebe3f36ead81b8275
author Dan Field <dnfield@google.com> Mon Nov 14 11:09:02 2022 -0800
committer GitHub <noreply@github.com> Mon Nov 14 19:09:02 2022 +0000
tree 93ec348835fcc66282b8c65228dc85f568d2d320
parent 1a79e86860361d5be283476d416c16074ca46171

Revert "Fix wrong `VSYNC` event (#36775)" (#37589)

This reverts commit 9ccaa33935d01aecc2d58148a6488cd44a35cd1f.

shell/common/vsync_waiter.cc

diff --git a/shell/common/vsync_waiter.cc b/shell/common/vsync_waiter.cc
index cb6f377..5ee04ef 100644
--- a/shell/common/vsync_waiter.cc
+++ b/shell/common/vsync_waiter.cc
@@ -89,17 +89,6 @@
                                bool pause_secondary_tasks) {
   FML_DCHECK(fml::TimePoint::Now() >= frame_start_time);
 
-  // The event named "VSYNC" is special in `chrome://tracing` tool - it will
-  // have a zebra visualization.
-  fml::tracing::TraceTimelineEvent(
-      "flutter", "VSYNC", frame_start_time.ToEpochDelta().ToMicroseconds(), 0,
-      Dart_Timeline_Event_Begin, {"frame_start_time", "frame_target_time"},
-      {std::to_string(frame_start_time.ToEpochDelta().ToMicroseconds()),
-       std::to_string(frame_target_time.ToEpochDelta().ToMicroseconds())});
-  fml::tracing::TraceTimelineEvent(
-      "flutter", "VSYNC", frame_target_time.ToEpochDelta().ToMicroseconds(), 0,
-      Dart_Timeline_Event_End, {}, {});
-
   Callback callback;
   std::vector<fml::closure> secondary_callbacks;
 

shell/common/vsync_waiter_fallback.cc

diff --git a/shell/common/vsync_waiter_fallback.cc b/shell/common/vsync_waiter_fallback.cc
index 467807c..89c3fb0 100644
--- a/shell/common/vsync_waiter_fallback.cc
+++ b/shell/common/vsync_waiter_fallback.cc
@@ -35,7 +35,7 @@
 
 // |VsyncWaiter|
 void VsyncWaiterFallback::AwaitVSync() {
-  TRACE_EVENT0("flutter", "VsyncCallback");
+  TRACE_EVENT0("flutter", "VSYNC");
 
   constexpr fml::TimeDelta kSingleFrameInterval =
       fml::TimeDelta::FromSecondsF(1.0 / 60.0);

shell/platform/android/vsync_waiter_android.cc

diff --git a/shell/platform/android/vsync_waiter_android.cc b/shell/platform/android/vsync_waiter_android.cc
index ff9f980..84e477e 100644
--- a/shell/platform/android/vsync_waiter_android.cc
+++ b/shell/platform/android/vsync_waiter_android.cc
@@ -52,7 +52,7 @@
 
 // static
 void VsyncWaiterAndroid::OnVsyncFromNDK(int64_t frame_nanos, void* data) {
-  TRACE_EVENT0("flutter", "VsyncCallback");
+  TRACE_EVENT0("flutter", "VSYNC");
 
   auto frame_time = fml::TimePoint::FromEpochDelta(
       fml::TimeDelta::FromNanoseconds(frame_nanos));
@@ -72,7 +72,7 @@
                                          jlong frameDelayNanos,
                                          jlong refreshPeriodNanos,
                                          jlong java_baton) {
-  TRACE_EVENT0("flutter", "VsyncCallback");
+  TRACE_EVENT0("flutter", "VSYNC");
 
   auto frame_time =
       fml::TimePoint::Now() - fml::TimeDelta::FromNanoseconds(frameDelayNanos);

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

diff --git a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
index cc732fd..6c6a454 100644
--- a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
+++ b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
@@ -102,7 +102,7 @@
 }
 
 - (void)onDisplayLink:(CADisplayLink*)link {
-  TRACE_EVENT0("flutter", "VsyncCallback");
+  TRACE_EVENT0("flutter", "VSYNC");
 
   CFTimeInterval delay = CACurrentMediaTime() - link.timestamp;
   fml::TimePoint frame_start_time = fml::TimePoint::Now() - fml::TimeDelta::FromSecondsF(delay);