Connect LoAF origin trial name with feature

(cherry picked from commit 8ae4587) Bug: 1457098 Change-Id: I1796cdd1e234904807e1a4e9841d61de5f376531 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4633460 Commit-Queue: Noam Rosenthal <nrosenthal@chromium.org> Reviewed-by: Yoav Weiss <yoavweiss@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#1161319} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4643268 Cr-Commit-Position: refs/branch-heads/5845@{#75} Cr-Branched-From: 5a5dff6-refs/heads/main@{#1160321}
chromium · Jun 26, 2023 · 15267f5 · 15267f5
1 parent edafb62
commit 15267f5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/third_party/blink/renderer/core/frame/animation_frame_timing_monitor.cc b/third_party/blink/renderer/core/frame/animation_frame_timing_monitor.cc
@@ -223,7 +223,8 @@ void AnimationFrameTimingMonitor::OnTaskCompleted(
     timing_info->SetDidPause();
   }
 
-  if (RuntimeEnabledFeatures::LongAnimationFrameTimingEnabled()) {
+  if (RuntimeEnabledFeatures::LongAnimationFrameTimingEnabled(
+          frame->DomWindow())) {
     DOMWindowPerformance::performance(*frame->DomWindow())
         ->ReportLongAnimationFrameTiming(timing_info);
   }

diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
@@ -316,9 +316,10 @@ WebFrameWidgetImpl::~WebFrameWidgetImpl() {
 
 void WebFrameWidgetImpl::BindLocalRoot(WebLocalFrame& local_root) {
   local_root_ = To<WebLocalFrameImpl>(local_root);
-  if (RuntimeEnabledFeatures::LongAnimationFrameMonitoringEnabled() &&
+  CHECK(local_root_ && local_root_->GetFrame());
+  if (RuntimeEnabledFeatures::LongAnimationFrameMonitoringEnabled(
+          local_root_->GetFrame()->DomWindow()) &&
       !IsHidden()) {
-    DCHECK(local_root_->GetFrame());
     animation_frame_timing_monitor_ =
         MakeGarbageCollected<AnimationFrameTimingMonitor>(
             *this, local_root_->GetFrame()->GetProbeSink());
@@ -4377,9 +4378,10 @@ void WebFrameWidgetImpl::WasShown(bool was_evicted) {
         &RemoteFrame::ResendVisualProperties);
   }
 
+  CHECK(local_root_ && local_root_->GetFrame());
   if (!animation_frame_timing_monitor_ &&
-      RuntimeEnabledFeatures::LongAnimationFrameTimingEnabled()) {
-    DCHECK(local_root_->GetFrame());
+      RuntimeEnabledFeatures::LongAnimationFrameMonitoringEnabled(
+          local_root_->GetFrame()->DomWindow())) {
     animation_frame_timing_monitor_ =
         MakeGarbageCollected<AnimationFrameTimingMonitor>(
             *this, local_root_->GetFrame()->GetProbeSink());

diff --git a/third_party/blink/renderer/core/timing/performance_observer.cc b/third_party/blink/renderer/core/timing/performance_observer.cc
@@ -72,7 +72,8 @@ Vector<AtomicString> PerformanceObserver::supportedEntryTypes(
         performance_entry_names::kLargestContentfulPaint);
     supportedEntryTypes.push_back(performance_entry_names::kLayoutShift);
 
-    if (RuntimeEnabledFeatures::LongAnimationFrameTimingEnabled()) {
+    if (RuntimeEnabledFeatures::LongAnimationFrameTimingEnabled(
+            execution_context)) {
       supportedEntryTypes.push_back(
           performance_entry_names::kLongAnimationFrame);
     }

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2168,13 +2168,15 @@
       // frames. Can be used for UKM or for the perofrmance API.
       name: "LongAnimationFrameMonitoring",
       implied_by: ["LongAnimationFrameTiming", "LongAnimationFrameUKM", "LongTaskFromLongAnimationFrame"],
-      status: "experimental"
+      status: "experimental",
+      origin_trial_feature_name: "LongAnimationFrameTiming"
     },
     {
       // Enables long aniamtion frames as a performance API (the
       // "long-animation-frame" timeline entry)
       name: "LongAnimationFrameTiming",
-      status: "experimental"
+      status: "experimental",
+      origin_trial_feature_name: "LongAnimationFrameTiming"
     },
     {
       // Enables long aniamtion frame logging to UKM

diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.cc
@@ -2396,11 +2396,9 @@ void MainThreadSchedulerImpl::OnTaskCompleted(
   if (queue) {
     queue->OnTaskRunTimeReported(task_timing);
 
-    if (RuntimeEnabledFeatures::LongAnimationFrameMonitoringEnabled()) {
-      if (FrameSchedulerImpl* frame_scheduler = queue->GetFrameScheduler()) {
-        frame_scheduler->OnTaskCompleted(task_timing,
-                                         task.GetDesiredExecutionTime());
-      }
+    if (FrameSchedulerImpl* frame_scheduler = queue->GetFrameScheduler()) {
+      frame_scheduler->OnTaskCompleted(task_timing,
+                                       task.GetDesiredExecutionTime());
     }
   }