Skip to content

Commit 95e45ed

Browse files
committed
Move tab from Performance view to VM Tools screen
1 parent 6c60744 commit 95e45ed

19 files changed

Lines changed: 398 additions & 501 deletions

File tree

packages/devtools_app/lib/devtools_app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ export 'src/screens/performance/panes/flutter_frames/flutter_frame_model.dart';
4141
export 'src/screens/performance/panes/flutter_frames/flutter_frames_chart.dart';
4242
export 'src/screens/performance/panes/flutter_frames/flutter_frames_controller.dart';
4343
export 'src/screens/performance/panes/frame_analysis/frame_analysis_model.dart';
44-
export 'src/screens/performance/panes/queued_microtasks/queued_microtasks_controller.dart';
4544
export 'src/screens/performance/panes/rebuild_stats/rebuild_stats_controller.dart';
4645
export 'src/screens/performance/panes/rebuild_stats/rebuild_stats_model.dart';
4746
export 'src/screens/performance/panes/timeline_events/perfetto/tracing/model.dart';
@@ -58,6 +57,7 @@ export 'src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart'
5857
export 'src/screens/vm_developer/object_inspector/class_hierarchy_explorer_controller.dart';
5958
export 'src/screens/vm_developer/object_inspector/object_inspector_view_controller.dart';
6059
export 'src/screens/vm_developer/object_inspector/vm_object_model.dart';
60+
export 'src/screens/vm_developer/queued_microtasks/queued_microtasks_controller.dart';
6161
export 'src/screens/vm_developer/vm_developer_tools_controller.dart';
6262
export 'src/screens/vm_developer/vm_developer_tools_screen.dart';
6363
export 'src/screens/vm_developer/vm_service_private_extensions.dart';

packages/devtools_app/lib/src/screens/performance/panes/queued_microtasks/queued_microtasks_view.dart

Lines changed: 0 additions & 252 deletions
This file was deleted.

packages/devtools_app/lib/src/screens/performance/performance_controller.dart

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import '../../shared/offline/offline_data.dart';
2222
import 'panes/controls/enhance_tracing/enhance_tracing_controller.dart';
2323
import 'panes/flutter_frames/flutter_frame_model.dart';
2424
import 'panes/flutter_frames/flutter_frames_controller.dart';
25-
import 'panes/queued_microtasks/queued_microtasks_controller.dart';
2625
import 'panes/rebuild_stats/rebuild_stats_controller.dart';
2726
import 'panes/rebuild_stats/rebuild_stats_model.dart';
2827
import 'panes/timeline_events/timeline_events_controller.dart';
@@ -54,8 +53,6 @@ class PerformanceController extends DevToolsScreenController
5453

5554
late final TimelineEventsController timelineEventsController;
5655

57-
late final QueuedMicrotasksController queuedMicrotasksController;
58-
5956
late final RebuildStatsController rebuildStatsController;
6057

6158
late List<PerformanceFeatureController> _featureControllers;
@@ -93,21 +90,17 @@ class PerformanceController extends DevToolsScreenController
9390
Future<void> get initialized => _initialized.future;
9491
final _initialized = Completer<void>();
9592

96-
final isQueuedMicrotasksFeatureActive = ValueNotifier<bool>(false);
97-
9893
@override
9994
void init() {
10095
super.init();
10196
// TODO(https://github.com/flutter/devtools/issues/5100): clean this up to
10297
// only create a controller when it is needed,
10398
flutterFramesController = FlutterFramesController(this);
10499
timelineEventsController = TimelineEventsController(this);
105-
queuedMicrotasksController = QueuedMicrotasksController(this);
106100
rebuildStatsController = RebuildStatsController(this);
107101
_featureControllers = [
108102
flutterFramesController,
109103
timelineEventsController,
110-
queuedMicrotasksController,
111104
rebuildStatsController,
112105
];
113106

@@ -258,8 +251,6 @@ class PerformanceController extends DevToolsScreenController
258251
featureController != null && c == featureController,
259252
),
260253
);
261-
isQueuedMicrotasksFeatureActive.value =
262-
queuedMicrotasksController.isActiveFeature;
263254
}
264255

265256
/// Clears the timeline data currently stored by the controller as well the

packages/devtools_app/lib/src/screens/performance/performance_screen.dart

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66

77
import 'package:devtools_app_shared/ui.dart';
88
import 'package:devtools_app_shared/utils.dart';
9-
import 'package:flutter/foundation.dart' show ValueListenable;
109
import 'package:flutter/material.dart';
1110
import 'package:flutter_markdown/flutter_markdown.dart';
1211
import 'package:provider/provider.dart';
@@ -36,18 +35,13 @@ class PerformanceScreen extends Screen {
3635
@override
3736
String get docPageId => id;
3837

39-
final _showIsolateSelector = ValueNotifier<bool>(false);
40-
41-
@override
42-
ValueListenable<bool> get showIsolateSelector => _showIsolateSelector;
43-
4438
@override
4539
Widget buildScreenBody(BuildContext context) {
4640
if (serviceConnection.serviceManager.connectedApp?.isDartWebAppNow ??
4741
false) {
4842
return const WebPerformanceScreenBody();
4943
}
50-
return PerformanceScreenBody(showIsolateSelector: _showIsolateSelector);
44+
return const PerformanceScreenBody();
5145
}
5246

5347
@override
@@ -57,14 +51,7 @@ class PerformanceScreen extends Screen {
5751
}
5852

5953
class PerformanceScreenBody extends StatefulWidget {
60-
const PerformanceScreenBody({
61-
super.key,
62-
// This allows the body to modify the value that gets returned by the
63-
// enclosing [PerformanceScreen]'s `showIsolateSelector` [ValueListenable].
64-
required this.showIsolateSelector,
65-
});
66-
67-
final ValueNotifier<bool> showIsolateSelector;
54+
const PerformanceScreenBody({super.key});
6855

6956
@override
7057
PerformanceScreenBodyState createState() => PerformanceScreenBodyState();
@@ -81,10 +68,6 @@ class PerformanceScreenBodyState extends State<PerformanceScreenBody>
8168
controller = screenControllers.lookup<PerformanceController>();
8269
addAutoDisposeListener(offlineDataController.showingOfflineData);
8370
addAutoDisposeListener(controller.loadingOfflineData);
84-
addAutoDisposeListener(controller.isQueuedMicrotasksFeatureActive, () {
85-
widget.showIsolateSelector.value =
86-
controller.isQueuedMicrotasksFeatureActive.value;
87-
});
8871
}
8972

9073
@override

0 commit comments

Comments
 (0)