Always report lifecycle timestamps. (#3682)

Always report lifecycle timestamps, otherwise PerformanceLifecycleTiming may get inconsistent lifecycle transitions. b/194127386 b/349423027
youtube · Jun 27, 2024 · b432540 · b432540
1 parent deb0b8f
commit b432540
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 26 deletions.
diff --git a/cobalt/browser/browser_module.cc b/cobalt/browser/browser_module.cc
@@ -60,6 +60,7 @@
 #include "cobalt/web/csp_delegate_factory.h"
 #include "cobalt/web/navigator_ua_data.h"
 #include "starboard/atomic.h"
+#include "starboard/common/time.h"
 #include "starboard/configuration.h"
 #include "starboard/extension/graphics.h"
 #include "starboard/system.h"
@@ -460,15 +461,16 @@ BrowserModule::~BrowserModule() {
 
   // Transition into the suspended state from whichever state we happen to
   // currently be in, to prepare for shutdown.
+  int64_t now = starboard::CurrentMonotonicTime();
   switch (application_state_) {
     case base::kApplicationStateStarted:
-      Blur(0);
+      Blur(now);
       FALLTHROUGH;
     case base::kApplicationStateBlurred:
-      Conceal(0);
+      Conceal(now);
       FALLTHROUGH;
     case base::kApplicationStateConcealed:
-      Freeze(0);
+      Freeze(now);
       break;
     case base::kApplicationStateStopped:
       NOTREACHED() << "BrowserModule does not support the stopped state.";

diff --git a/cobalt/browser/debug_console.h b/cobalt/browser/debug_console.h
@@ -98,21 +98,21 @@ class DebugConsole : public LifecycleObserver {
   }
 
   // LifecycleObserver implementation.
-  void Blur(int64_t timestamp) override { web_module_->Blur(0); }
+  void Blur(int64_t timestamp) override { web_module_->Blur(timestamp); }
   void Conceal(render_tree::ResourceProvider* resource_provider,
                int64_t timestamp) override {
-    web_module_->Conceal(resource_provider, 0);
+    web_module_->Conceal(resource_provider, timestamp);
   }
-  void Freeze(int64_t timestamp) override { web_module_->Freeze(0); }
+  void Freeze(int64_t timestamp) override { web_module_->Freeze(timestamp); }
   void Unfreeze(render_tree::ResourceProvider* resource_provider,
                 int64_t timestamp) override {
-    web_module_->Unfreeze(resource_provider, 0);
+    web_module_->Unfreeze(resource_provider, timestamp);
   }
   void Reveal(render_tree::ResourceProvider* resource_provider,
               int64_t timestamp) override {
-    web_module_->Reveal(resource_provider, 0);
+    web_module_->Reveal(resource_provider, timestamp);
   }
-  void Focus(int64_t timestamp) override { web_module_->Focus(0); }
+  void Focus(int64_t timestamp) override { web_module_->Focus(timestamp); }
 
   void ReduceMemory() { web_module_->ReduceMemory(); }
 

diff --git a/cobalt/browser/splash_screen.h b/cobalt/browser/splash_screen.h
@@ -57,21 +57,21 @@ class SplashScreen : public LifecycleObserver {
   }
 
   // LifecycleObserver implementation.
-  void Blur(int64_t timestamp) override { web_module_->Blur(0); }
+  void Blur(int64_t timestamp) override { web_module_->Blur(timestamp); }
   void Conceal(render_tree::ResourceProvider* resource_provider,
                int64_t timestamp) override {
-    web_module_->Conceal(resource_provider, 0);
+    web_module_->Conceal(resource_provider, timestamp);
   }
-  void Freeze(int64_t timestamp) override { web_module_->Freeze(0); }
+  void Freeze(int64_t timestamp) override { web_module_->Freeze(timestamp); }
   void Unfreeze(render_tree::ResourceProvider* resource_provider,
                 int64_t timestamp) override {
-    web_module_->Unfreeze(resource_provider, 0);
+    web_module_->Unfreeze(resource_provider, timestamp);
   }
   void Reveal(render_tree::ResourceProvider* resource_provider,
               int64_t timestamp) override {
-    web_module_->Reveal(resource_provider, 0);
+    web_module_->Reveal(resource_provider, timestamp);
   }
-  void Focus(int64_t timestamp) override { web_module_->Focus(0); }
+  void Focus(int64_t timestamp) override { web_module_->Focus(timestamp); }
 
   void ReduceMemory() { web_module_->ReduceMemory(); }
 

diff --git a/cobalt/dom/performance_lifecycle_timing.cc b/cobalt/dom/performance_lifecycle_timing.cc
@@ -104,6 +104,14 @@ std::string PerformanceLifecycleTiming::last_state() const {
   return TranslateApplicationStateToString(lifecycle_timing_info_.last_state);
 }
 
+void PerformanceLifecycleTiming::LogInvalidStateTransition(
+    base::ApplicationState state) {
+  DLOG(INFO) << "Current State: "
+             << TranslateApplicationStateToString(GetCurrentState());
+  DLOG(INFO) << "Next State: " << TranslateApplicationStateToString(state);
+  NOTREACHED() << "Invalid application state transition.";
+}
+
 void PerformanceLifecycleTiming::SetApplicationState(
     base::ApplicationState state, int64_t timestamp) {
   switch (state) {
@@ -116,11 +124,7 @@ void PerformanceLifecycleTiming::SetApplicationState(
       } else if (GetCurrentState() == base::kApplicationStateConcealed) {
         lifecycle_timing_info_.app_reveal = timestamp;
       } else {
-        DLOG(INFO) << "Current State: "
-                   << TranslateApplicationStateToString(GetCurrentState());
-        DLOG(INFO) << "Next State: "
-                   << TranslateApplicationStateToString(state);
-        NOTREACHED() << "Invalid application state transition.";
+        LogInvalidStateTransition(state);
       }
       break;
     case base::kApplicationStateConcealed:
@@ -130,11 +134,7 @@ void PerformanceLifecycleTiming::SetApplicationState(
       } else if (GetCurrentState() == base::kApplicationStateFrozen) {
         lifecycle_timing_info_.app_unfreeze = timestamp;
       } else {
-        DLOG(INFO) << "Current State: "
-                   << TranslateApplicationStateToString(GetCurrentState());
-        DLOG(INFO) << "Next State: "
-                   << TranslateApplicationStateToString(state);
-        NOTREACHED() << "Invalid application state transition.";
+        LogInvalidStateTransition(state);
       }
       break;
     case base::kApplicationStateFrozen:

diff --git a/cobalt/dom/performance_lifecycle_timing.h b/cobalt/dom/performance_lifecycle_timing.h
@@ -62,6 +62,9 @@ class PerformanceLifecycleTiming : public PerformanceEntry {
   void SetLifecycleTimingInfoState(base::ApplicationState state);
   DOMHighResTimeStamp ReportDOMHighResTimeStamp(int64_t timestamp) const;
   base::ApplicationState GetCurrentState() const;
+
+  void LogInvalidStateTransition(base::ApplicationState state);
+
   struct LifecycleTimingInfo {
     int64_t app_preload = 0;
     int64_t app_start = 0;

diff --git a/cobalt/dom/window.cc b/cobalt/dom/window.cc
@@ -481,7 +481,6 @@ void Window::SetApplicationState(base::ApplicationState state,
                                  int64_t timestamp) {
   html_element_context()->application_lifecycle_state()->SetApplicationState(
       state);
-  if (timestamp == 0) return;
   performance_->SetApplicationState(state, timestamp);
   window_timers_.SetApplicationState(state);
 }