Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:async';
import 'dart:html' as html;
import 'dart:ui' as ui;

Expand Down Expand Up @@ -116,20 +115,20 @@ class PerfettoControllerImpl extends PerfettoController {
}

@override
Future<void> onBecomingActive() async {
void onBecomingActive() {
assert(timelineEventsController.isActiveFeature);
if (pendingTraceEventsToLoad != null) {
await loadTrace(pendingTraceEventsToLoad!);
loadTrace(pendingTraceEventsToLoad!);
pendingTraceEventsToLoad = null;
}
if (pendingScrollToTimeRange != null) {
await scrollToTimeRange(pendingScrollToTimeRange!);
scrollToTimeRange(pendingScrollToTimeRange!);
pendingScrollToTimeRange = null;
}
}

@override
Future<void> loadTrace(List<TraceEventWrapper> devToolsTraceEvents) async {
void loadTrace(List<TraceEventWrapper> devToolsTraceEvents) {
if (!timelineEventsController.isActiveFeature) {
pendingTraceEventsToLoad = List.from(devToolsTraceEvents);
return;
Expand All @@ -139,7 +138,7 @@ class PerfettoControllerImpl extends PerfettoController {
}

@override
Future<void> scrollToTimeRange(TimeRange timeRange) async {
void scrollToTimeRange(TimeRange timeRange) {
if (!timelineEventsController.isActiveFeature) {
pendingScrollToTimeRange = timeRange;
return;
Expand All @@ -149,7 +148,7 @@ class PerfettoControllerImpl extends PerfettoController {
}

@override
Future<void> clear() async {
await loadTrace([]);
void clear() {
loadTrace([]);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ abstract class PerfettoController extends DisposableController {

void init() {}

Future<void> onBecomingActive() async {}
void onBecomingActive() async {}

Future<void> loadTrace(List<TraceEventWrapper> devToolsTraceEvents) async {}
void loadTrace(List<TraceEventWrapper> devToolsTraceEvents) async {}

Future<void> scrollToTimeRange(TimeRange timeRange) async {}
void scrollToTimeRange(TimeRange timeRange) async {}

Future<void> clear() async {}
void clear() async {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class TimelineEventsController extends PerformanceFeatureController
@override
Future<void> onBecomingActive() async {
if (_perfettoMode) {
await perfettoController.onBecomingActive();
perfettoController.onBecomingActive();
}
await super.onBecomingActive();
}
Expand Down Expand Up @@ -279,7 +279,7 @@ class TimelineEventsController extends PerformanceFeatureController
Future<void> _processAllTraceEvents() async {
if (_perfettoMode) {
await perfettoController.processor.processData(allTraceEvents);
await perfettoController.loadTrace(allTraceEvents);
perfettoController.loadTrace(allTraceEvents);
} else {
await legacyController.processTraceEvents(
allTraceEvents,
Expand Down Expand Up @@ -349,7 +349,7 @@ class TimelineEventsController extends PerformanceFeatureController
}
}

await perfettoController.scrollToTimeRange(frame.timeFromFrameTiming);
perfettoController.scrollToTimeRange(frame.timeFromFrameTiming);
}

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

if (offlineData.selectedFrame != null && _perfettoMode) {
await perfettoController
perfettoController
.scrollToTimeRange(offlineData.selectedFrame!.timeFromFrameTiming);
}
}

@override
Future<void> clearData() async {
void clearData() {
allTraceEvents.clear();
_unassignedFlutterFrameEvents.clear();

Expand All @@ -547,7 +547,7 @@ class TimelineEventsController extends PerformanceFeatureController
legacyController.clearData();
_status.value = EventsControllerStatus.empty;
if (FeatureFlags.embeddedPerfetto) {
await perfettoController.clear();
perfettoController.clear();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void main() {
when(mockPerformanceController.data).thenReturn(data);
when(mockPerformanceController.clearData()).thenAnswer((_) async {
data.clear();
await timelineEventsController.clearData();
timelineEventsController.clearData();
});
processor = timelineEventsController.legacyController.processor
..primeThreadIds(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void main() {
// Verify an empty list is returned for bad input.
expect(eventsController.legacyController.matchesForSearch(''), isEmpty);

await eventsController.clearData();
eventsController.clearData();
expect(eventsController.data!.timelineEvents, isEmpty);
expect(
eventsController.legacyController.matchesForSearch('test'),
Expand All @@ -111,7 +111,7 @@ void main() {
});

test('search query searches through previous matches', () async {
await eventsController.clearData();
eventsController.clearData();
eventsController.addTimelineEvent(goldenUiTimelineEvent..deepCopy());

final data = eventsController.data!;
Expand Down