From bbbe855795b057041b361e7f9995ab95f35277e3 Mon Sep 17 00:00:00 2001
From: Polina Cherkasova <polina.c@live.com>
Date: Thu, 25 Apr 2024 21:55:21 -0700
Subject: [PATCH] -

---
 .../src/screens/memory/framework/memory_controller.dart   | 1 -
 .../panes/chart/controller/chart_pane_controller.dart     | 8 +-------
 .../chart/controller/charts/android_chart_controller.dart | 2 +-
 .../chart/controller/charts/event_chart_controller.dart   | 2 +-
 .../chart/controller/charts/vm_chart_controller.dart      | 2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/devtools_app/lib/src/screens/memory/framework/memory_controller.dart b/packages/devtools_app/lib/src/screens/memory/framework/memory_controller.dart
index 08cb11d96b3..450a40dc6f4 100644
--- a/packages/devtools_app/lib/src/screens/memory/framework/memory_controller.dart
+++ b/packages/devtools_app/lib/src/screens/memory/framework/memory_controller.dart
@@ -35,7 +35,6 @@ class MemoryController extends DisposableController
     @visibleForTesting DiffPaneController? connectedDiff,
     @visibleForTesting ProfilePaneController? connectedProfile,
   }) {
-    print('!!!!!!!!! creating MemoryController');
     if (connectedDiff != null || connectedProfile != null) {
       _mode = DevToolsMode.connected;
     } else {
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/chart_pane_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/chart_pane_controller.dart
index ef06de1dd00..ead618c5867 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/chart_pane_controller.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/chart_pane_controller.dart
@@ -50,6 +50,7 @@ class MemoryChartPaneController extends DisposableController
     } else {
       assert(offlineData!.isDeviceAndroid != null);
       data = offlineData!;
+      _paused.value = false;
       recomputeChartData();
     }
 
@@ -65,14 +66,7 @@ class MemoryChartPaneController extends DisposableController
       () => unawaited(_onChartVisibilityChanged()),
     );
 
-    if (mode == DevToolsMode.offlineData) {
-      _paused.value = false;
-      // data.timeline.notifyAboutAllSamples();
-      recomputeChartData();
-      print('!!! sent notifyAboutAllSamples and recomputeChartData');
-    }
     _initialized.complete();
-    print('!!! MemoryChartPaneController init');
   }
 
   late final EventChartController event =
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart
index 9667bd76a3a..cf74319ca70 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/android_chart_controller.dart
@@ -34,7 +34,6 @@ class AndroidChartController extends ChartController {
           name: 'Android',
           sharedLabelTimestamps: sharedLabels,
         ) {
-    _setupTraces();
     setupData();
 
     addAutoDisposeListener(memoryTimeline.sampleAdded, () {
@@ -52,6 +51,7 @@ class AndroidChartController extends ChartController {
   /// Preload any existing data collected but not in the chart.
   @override
   void setupData() {
+    _setupTraces();
     // Only display if traces have been created. Android memory may not
     // have been toggled to be displayed - yet.
     if (traces.isNotEmpty) {
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/event_chart_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/event_chart_controller.dart
index 0f3bf0446ad..4fb6b7df091 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/event_chart_controller.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/event_chart_controller.dart
@@ -59,7 +59,6 @@ class EventChartController extends ChartController {
           displayXLabels: false,
           name: 'Event Pane',
         ) {
-    _setupTraces();
     setFixedYRange(_Sizes.visibleVm, _Sizes.extensions);
     setupData();
 
@@ -75,6 +74,7 @@ class EventChartController extends ChartController {
 
   @override
   void setupData() {
+    _setupTraces();
     final chartDataLength = timestampsLength;
     final dataLength = memoryTimeline.data.length;
 
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart
index c63de0f38e8..dd2a3fd03fb 100644
--- a/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart
+++ b/packages/devtools_app/lib/src/screens/memory/panes/chart/controller/charts/vm_chart_controller.dart
@@ -27,7 +27,6 @@ class _Colors {
 class VMChartController extends ChartController {
   VMChartController(this.memoryTimeline, {required this.paused})
       : super(name: 'VM Memory') {
-    _setupTraces();
     setupData();
 
     addAutoDisposeListener(memoryTimeline.sampleAdded, () {
@@ -42,6 +41,7 @@ class VMChartController extends ChartController {
 
   @override
   void setupData() {
+    _setupTraces();
     final chartDataLength = timestampsLength;
     final dataLength = memoryTimeline.data.length;