Merge "Fix windows build."
diff --git a/README.chromium b/README.chromium
index a8a7cb6..33541c5 100644
--- a/README.chromium
+++ b/README.chromium
@@ -2,7 +2,7 @@
URL: https://android.googlesource.com/platform/external/perfetto/
Version: unknown
License: Apache2
-License File: MODULE_LICENSE_APACHE2
+License File: NOTICE
Security Critical: yes
License Android Compatible: yes
Description: Performance instrumentation and logging for Google client platforms
diff --git a/ui/src/common/actions.ts b/ui/src/common/actions.ts
index fb4e502..5ae4598 100644
--- a/ui/src/common/actions.ts
+++ b/ui/src/common/actions.ts
@@ -18,20 +18,23 @@
type StateDraft = DraftObject<State>;
+
+function clearTraceState(state: StateDraft) {
+ state.traceTime = defaultTraceTime;
+ state.visibleTraceTime = defaultTraceTime;
+ state.pinnedTracks = [];
+ state.scrollingTracks = [];
+}
+
export const StateActions = {
navigate(state: StateDraft, args: {route: string}): void {
state.route = args.route;
},
- // TODO(hjd): Factor common code from openTraceFromUrl.
openTraceFromFile(state: StateDraft, args: {file: File}): void {
- state.traceTime = defaultTraceTime;
- state.visibleTraceTime = defaultTraceTime;
+ clearTraceState(state);
const id = `${state.nextId++}`;
- // Reset displayed tracks.
- state.pinnedTracks = [];
- state.scrollingTracks = [];
state.engines[id] = {
id,
ready: false,
@@ -40,14 +43,9 @@
state.route = `/viewer`;
},
- // TODO(hjd): Factor common code from openTraceFromFile.
openTraceFromUrl(state: StateDraft, args: {url: string}): void {
- state.traceTime = defaultTraceTime;
- state.visibleTraceTime = defaultTraceTime;
+ clearTraceState(state);
const id = `${state.nextId++}`;
- // Reset displayed tracks.
- state.pinnedTracks = [];
- state.scrollingTracks = [];
state.engines[id] = {
id,
ready: false,