trunk/src/build/android/chrome_profiler/systrace_controller.py - Issue 330713002: Revert 276779 "Move adb_profile_chrome under tools/android/"

Side by Side Diff

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

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

Side by Side Diff: trunk/src/build/android/chrome_profiler/systrace_controller.py

Issue 330713002: Revert 276779 "Move adb_profile_chrome under tools/android/" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 6 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:

OLD	NEW
1 # Copyright 2014 The Chromium Authors. All rights reserved.	1 # Copyright 2014 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 import threading	5 import threading

6 import zlib	6 import zlib

7	7

8 from chrome_profiler import controllers	8 from chrome_profiler import controllers

9 from chrome_profiler import util	9 from chrome_profiler import util

10	10

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 except ValueError:	86 except ValueError:

87 raise RuntimeError('Systrace start marker not found')	87 raise RuntimeError('Systrace start marker not found')

88 trace_data = trace_data[trace_start + 6:]	88 trace_data = trace_data[trace_start + 6:]

89	89

90 # Collapse CRLFs that are added by adb shell.	90 # Collapse CRLFs that are added by adb shell.

91 if trace_data.startswith('\r\n'):	91 if trace_data.startswith('\r\n'):

92 trace_data = trace_data.replace('\r\n', '\n')	92 trace_data = trace_data.replace('\r\n', '\n')

93	93

94 # Skip the initial newline.	94 # Skip the initial newline.

95 return trace_data[1:]	95 return trace_data[1:]

OLD	NEW