telemetry/telemetry/internal/platform/profiler/trace_profiler.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/internal/platform/profiler/trace_profiler.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/internal/platform/linux_based_platform_backend_unittest.py ('k') | telemetry/telemetry/internal/platform/tracing_agent/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: telemetry/telemetry/internal/platform/profiler/trace_profiler.py

diff --git a/telemetry/telemetry/internal/platform/profiler/trace_profiler.py b/telemetry/telemetry/internal/platform/profiler/trace_profiler.py

index d68ea7a0b7a3edab976a7e2850224aef2f09bb98..76b5632f5af0becc2ad589e47913ea6e2db4c9a6 100644

--- a/telemetry/telemetry/internal/platform/profiler/trace_profiler.py

+++ b/telemetry/telemetry/internal/platform/profiler/trace_profiler.py

@@ -7,8 +7,8 @@ import StringIO

import zipfile

from telemetry.internal.platform import profiler

+from telemetry.timeline import chrome_trace_category_filter

from telemetry.timeline import trace_data as trace_data_module

-from telemetry.timeline import tracing_category_filter

from telemetry.timeline import tracing_config

@@ -25,8 +25,9 @@ class TraceProfiler(profiler.Profiler):

categories_with_flow += ',%s' % categories

config = tracing_config.TracingConfig()

config.enable_chrome_trace = True

- config.chrome_trace_config.SetTracingCategoryFilter(

- tracing_category_filter.TracingCategoryFilter(categories_with_flow))

+ config.chrome_trace_config.SetCategoryFilter(

+ chrome_trace_category_filter.ChromeTraceCategoryFilter(

+ categories_with_flow))

self._browser_backend.StartTracing(config, timeout=10)

@classmethod