telemetry/telemetry/timeline/trace_data.py - Issue 2162963002: [polymer] Merge of master into polymer10-migration

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: telemetry/telemetry/timeline/trace_data.py

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration

Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « telemetry/telemetry/timeline/chrome_trace_config_unittest.py ('k') | telemetry/telemetry/timeline/tracing_category_filter.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: telemetry/telemetry/timeline/trace_data.py

diff --git a/telemetry/telemetry/timeline/trace_data.py b/telemetry/telemetry/timeline/trace_data.py

index e30bb2c7d06e948380422afbcd95f174139a6394..1e016463a08fa20047b3f438fdaa6422b5054d68 100644

--- a/telemetry/telemetry/timeline/trace_data.py

+++ b/telemetry/telemetry/timeline/trace_data.py

@@ -40,6 +40,7 @@ class TraceDataPart(object):

ATRACE_PART = TraceDataPart('systemTraceEvents')

BATTOR_TRACE_PART = TraceDataPart('powerTraceAsString')

CHROME_TRACE_PART = TraceDataPart('traceEvents')

+CPU_TRACE_DATA = TraceDataPart('cpuSnapshots')

INSPECTOR_TRACE_PART = TraceDataPart('inspectorTimelineEvents')

SURFACE_FLINGER_PART = TraceDataPart('surfaceFlinger')

TAB_ID_PART = TraceDataPart('tabIds')

@@ -48,6 +49,7 @@ TELEMETRY_PART = TraceDataPart('telemetry')

ALL_TRACE_PARTS = {ATRACE_PART,

BATTOR_TRACE_PART,

CHROME_TRACE_PART,

+ CPU_TRACE_DATA,

INSPECTOR_TRACE_PART,

SURFACE_FLINGER_PART,

TAB_ID_PART,