From 39c46dea4b7347a252218aaff5caac5dc2fec8cd Mon Sep 17 00:00:00 2001
From: Gary Qian <garyq@google.com>
Date: Fri, 1 Mar 2019 15:14:20 -0800
Subject: [PATCH] Revert "Buffer lifecycle in WindowData (#7999)" (#8010)

This reverts commit 0b174017143c34629546134601bb6c65becf71a3.
---
 lib/ui/hooks.dart             |  7 -------
 lib/ui/window.dart            |  9 ---------
 lib/ui/window/window.cc       | 12 ------------
 lib/ui/window/window.h        |  1 -
 runtime/runtime_controller.cc | 14 +-------------
 runtime/runtime_controller.h  |  3 ---
 shell/common/engine.cc        |  2 --
 7 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/lib/ui/hooks.dart b/lib/ui/hooks.dart
index a7e831245c..b1550bf90b 100644
--- a/lib/ui/hooks.dart
+++ b/lib/ui/hooks.dart
@@ -89,13 +89,6 @@ void _updateUserSettingsData(String jsonData) {
   _updatePlatformBrightness(data['platformBrightness']);
 }
 
-@pragma('vm:entry-point')
-// ignore: unused_element
-void _updateLifecycleState(String state) {
-  window._initialLifecycleState ??= state;
-}
-
-
 void _updateTextScaleFactor(double textScaleFactor) {
   window._textScaleFactor = textScaleFactor;
   _invoke(window.onTextScaleFactorChanged, window._onTextScaleFactorChangedZone);
diff --git a/lib/ui/window.dart b/lib/ui/window.dart
index 6abceceb02..d89b668b70 100644
--- a/lib/ui/window.dart
+++ b/lib/ui/window.dart
@@ -556,15 +556,6 @@ class Window {
     _onLocaleChangedZone = Zone.current;
   }
 
-  /// The lifecycle state immediately after dart isolate initialization.
-  ///
-  /// This property will not be updated as the lifecycle changes.
-  ///
-  /// It is used to initialize [SchedulerBinding.lifecycleState] at startup
-  /// with any buffered lifecycle state events.
-  String get initialLifecycleState => _initialLifecycleState;
-  String _initialLifecycleState;
-
   /// The system-reported text scale.
   ///
   /// This establishes the text scaling factor to use when rendering text,
diff --git a/lib/ui/window/window.cc b/lib/ui/window/window.cc
index bfeb86cef6..0a90d6fcbf 100644
--- a/lib/ui/window/window.cc
+++ b/lib/ui/window/window.cc
@@ -217,18 +217,6 @@ void Window::UpdateUserSettingsData(const std::string& data) {
                                            }));
 }
 
-void Window::UpdateLifecycleState(const std::string& data) {
-  std::shared_ptr<tonic::DartState> dart_state = library_.dart_state().lock();
-  if (!dart_state)
-    return;
-  tonic::DartState::Scope scope(dart_state);
-  tonic::LogIfError(tonic::DartInvokeField(library_.value(),
-                                           "_updateLifecycleState",
-                                           {
-                                               tonic::StdStringToDart(data),
-                                           }));
-}
-
 void Window::UpdateSemanticsEnabled(bool enabled) {
   std::shared_ptr<tonic::DartState> dart_state = library_.dart_state().lock();
   if (!dart_state)
diff --git a/lib/ui/window/window.h b/lib/ui/window/window.h
index f5624e4bad..94a506fb5f 100644
--- a/lib/ui/window/window.h
+++ b/lib/ui/window/window.h
@@ -65,7 +65,6 @@ class Window final {
   void UpdateWindowMetrics(const ViewportMetrics& metrics);
   void UpdateLocales(const std::vector<std::string>& locales);
   void UpdateUserSettingsData(const std::string& data);
-  void UpdateLifecycleState(const std::string& data);
   void UpdateSemanticsEnabled(bool enabled);
   void UpdateAccessibilityFeatures(int32_t flags);
   void DispatchPlatformMessage(fml::RefPtr<PlatformMessage> message);
diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc
index 83a848e879..b57f2232ac 100644
--- a/runtime/runtime_controller.cc
+++ b/runtime/runtime_controller.cc
@@ -128,8 +128,7 @@ bool RuntimeController::FlushRuntimeStateToIsolate() {
          SetLocales(window_data_.locale_data) &&
          SetSemanticsEnabled(window_data_.semantics_enabled) &&
          SetAccessibilityFeatures(window_data_.accessibility_feature_flags_) &&
-         SetUserSettingsData(window_data_.user_settings_data) &&
-         SetLifecycleState(window_data_.lifecycle_state);
+         SetUserSettingsData(window_data_.user_settings_data);
 }
 
 bool RuntimeController::SetViewportMetrics(const ViewportMetrics& metrics) {
@@ -165,17 +164,6 @@ bool RuntimeController::SetUserSettingsData(const std::string& data) {
   return false;
 }
 
-bool RuntimeController::SetLifecycleState(const std::string& data) {
-  window_data_.lifecycle_state = data;
-
-  if (auto* window = GetWindowIfAvailable()) {
-    window->UpdateLifecycleState(window_data_.lifecycle_state);
-    return true;
-  }
-
-  return false;
-}
-
 bool RuntimeController::SetSemanticsEnabled(bool enabled) {
   window_data_.semantics_enabled = enabled;
 
diff --git a/runtime/runtime_controller.h b/runtime/runtime_controller.h
index 03f1389d8c..c913795b8e 100644
--- a/runtime/runtime_controller.h
+++ b/runtime/runtime_controller.h
@@ -49,8 +49,6 @@ class RuntimeController final : public WindowClient {
 
   bool SetUserSettingsData(const std::string& data);
 
-  bool SetLifecycleState(const std::string& data);
-
   bool SetSemanticsEnabled(bool enabled);
 
   bool SetAccessibilityFeatures(int32_t flags);
@@ -113,7 +111,6 @@ class RuntimeController final : public WindowClient {
     std::string variant_code;
     std::vector<std::string> locale_data;
     std::string user_settings_data = "{}";
-    std::string lifecycle_state;
     bool semantics_enabled = false;
     bool assistive_technology_enabled = false;
     int32_t accessibility_feature_flags_ = 0;
diff --git a/shell/common/engine.cc b/shell/common/engine.cc
index e5b818b0c6..084216072e 100644
--- a/shell/common/engine.cc
+++ b/shell/common/engine.cc
@@ -291,8 +291,6 @@ bool Engine::HandleLifecyclePlatformMessage(blink::PlatformMessage* message) {
   if (state == "AppLifecycleState.resumed" && have_surface_) {
     ScheduleFrame();
   }
-  runtime_controller_->SetLifecycleState(state);
-  // We always want pass the message forwards directly into the framework.
   return false;
 }
 
-- 
GitLab