Skip to content

Commit c34a4c3

Browse files
Remove unnecessary Future types in Perfetto code. (#4864)
* Fix type error in Perfetto code * Remove unnecessary Future types
1 parent a7365bf commit c34a4c3

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_controller_web.dart

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'dart:async';
65
import 'dart:html' as html;
76
import 'dart:ui' as ui;
87

@@ -116,20 +115,20 @@ class PerfettoControllerImpl extends PerfettoController {
116115
}
117116

118117
@override
119-
Future<void> onBecomingActive() async {
118+
void onBecomingActive() {
120119
assert(timelineEventsController.isActiveFeature);
121120
if (pendingTraceEventsToLoad != null) {
122-
await loadTrace(pendingTraceEventsToLoad!);
121+
loadTrace(pendingTraceEventsToLoad!);
123122
pendingTraceEventsToLoad = null;
124123
}
125124
if (pendingScrollToTimeRange != null) {
126-
await scrollToTimeRange(pendingScrollToTimeRange!);
125+
scrollToTimeRange(pendingScrollToTimeRange!);
127126
pendingScrollToTimeRange = null;
128127
}
129128
}
130129

131130
@override
132-
Future<void> loadTrace(List<TraceEventWrapper> devToolsTraceEvents) async {
131+
void loadTrace(List<TraceEventWrapper> devToolsTraceEvents) {
133132
if (!timelineEventsController.isActiveFeature) {
134133
pendingTraceEventsToLoad = List.from(devToolsTraceEvents);
135134
return;
@@ -139,7 +138,7 @@ class PerfettoControllerImpl extends PerfettoController {
139138
}
140139

141140
@override
142-
Future<void> scrollToTimeRange(TimeRange timeRange) async {
141+
void scrollToTimeRange(TimeRange timeRange) {
143142
if (!timelineEventsController.isActiveFeature) {
144143
pendingScrollToTimeRange = timeRange;
145144
return;
@@ -149,7 +148,7 @@ class PerfettoControllerImpl extends PerfettoController {
149148
}
150149

151150
@override
152-
Future<void> clear() async {
153-
await loadTrace([]);
151+
void clear() {
152+
loadTrace([]);
154153
}
155154
}

packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/perfetto_controller.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ abstract class PerfettoController extends DisposableController {
3535

3636
void init() {}
3737

38-
Future<void> onBecomingActive() async {}
38+
void onBecomingActive() async {}
3939

40-
Future<void> loadTrace(List<TraceEventWrapper> devToolsTraceEvents) async {}
40+
void loadTrace(List<TraceEventWrapper> devToolsTraceEvents) async {}
4141

42-
Future<void> scrollToTimeRange(TimeRange timeRange) async {}
42+
void scrollToTimeRange(TimeRange timeRange) async {}
4343

44-
Future<void> clear() async {}
44+
void clear() async {}
4545
}

packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_controller.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class TimelineEventsController extends PerformanceFeatureController
137137
@override
138138
Future<void> onBecomingActive() async {
139139
if (_perfettoMode) {
140-
await perfettoController.onBecomingActive();
140+
perfettoController.onBecomingActive();
141141
}
142142
await super.onBecomingActive();
143143
}
@@ -279,7 +279,7 @@ class TimelineEventsController extends PerformanceFeatureController
279279
Future<void> _processAllTraceEvents() async {
280280
if (_perfettoMode) {
281281
await perfettoController.processor.processData(allTraceEvents);
282-
await perfettoController.loadTrace(allTraceEvents);
282+
perfettoController.loadTrace(allTraceEvents);
283283
} else {
284284
await legacyController.processTraceEvents(
285285
allTraceEvents,
@@ -349,7 +349,7 @@ class TimelineEventsController extends PerformanceFeatureController
349349
}
350350
}
351351

352-
await perfettoController.scrollToTimeRange(frame.timeFromFrameTiming);
352+
perfettoController.scrollToTimeRange(frame.timeFromFrameTiming);
353353
}
354354

355355
Future<void> _legacySelectFrame(FlutterFrame frame) async {
@@ -532,13 +532,13 @@ class TimelineEventsController extends PerformanceFeatureController
532532
await legacyController.setOfflineData(offlineData);
533533

534534
if (offlineData.selectedFrame != null && _perfettoMode) {
535-
await perfettoController
535+
perfettoController
536536
.scrollToTimeRange(offlineData.selectedFrame!.timeFromFrameTiming);
537537
}
538538
}
539539

540540
@override
541-
Future<void> clearData() async {
541+
void clearData() {
542542
allTraceEvents.clear();
543543
_unassignedFlutterFrameEvents.clear();
544544

@@ -547,7 +547,7 @@ class TimelineEventsController extends PerformanceFeatureController
547547
legacyController.clearData();
548548
_status.value = EventsControllerStatus.empty;
549549
if (FeatureFlags.embeddedPerfetto) {
550-
await perfettoController.clear();
550+
perfettoController.clear();
551551
}
552552
}
553553

packages/devtools_app/test/performance/timeline_events/legacy/legacy_event_processor_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void main() {
5454
when(mockPerformanceController.data).thenReturn(data);
5555
when(mockPerformanceController.clearData()).thenAnswer((_) async {
5656
data.clear();
57-
await timelineEventsController.clearData();
57+
timelineEventsController.clearData();
5858
});
5959
processor = timelineEventsController.legacyController.processor
6060
..primeThreadIds(

packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void main() {
8888
// Verify an empty list is returned for bad input.
8989
expect(eventsController.legacyController.matchesForSearch(''), isEmpty);
9090

91-
await eventsController.clearData();
91+
eventsController.clearData();
9292
expect(eventsController.data!.timelineEvents, isEmpty);
9393
expect(
9494
eventsController.legacyController.matchesForSearch('test'),
@@ -111,7 +111,7 @@ void main() {
111111
});
112112

113113
test('search query searches through previous matches', () async {
114-
await eventsController.clearData();
114+
eventsController.clearData();
115115
eventsController.addTimelineEvent(goldenUiTimelineEvent..deepCopy());
116116

117117
final data = eventsController.data!;

0 commit comments

Comments
 (0)