Commit 52fa705a authored by nednguyen's avatar nednguyen Committed by Commit bot

Roll trace-viewer deps to the latest.

Modify tracing_ui.cc to add record-as-much-as-possible mode for about://tracing.
This time, the roll should decrease trace-viewer size from 1.6 M -> 1.4 M with
minification using rjsmin.

Verified that the size of resources.pak reduces from 17278967 to 16888789.

BUG=396081, 471610, 469646

Review URL: https://codereview.chromium.org/1066903002

Cr-Commit-Position: refs/heads/master@{#324192}
parent 1b068129
...@@ -132,7 +132,7 @@ deps = { ...@@ -132,7 +132,7 @@ deps = {
Var('chromium_git') + '/crashpad/crashpad.git' + '@' + 'e1347a740c051d9a44aa2dd0b9d11067a53e0447', Var('chromium_git') + '/crashpad/crashpad.git' + '@' + 'e1347a740c051d9a44aa2dd0b9d11067a53e0447',
'src/third_party/trace-viewer': 'src/third_party/trace-viewer':
Var('chromium_git') + '/external/trace-viewer.git' + '@' + 'ff20313e37892c3c7f20c88bb22ab6f6e65659ae', Var('chromium_git') + '/external/trace-viewer.git' + '@' + '07909fe53e549b42634142ef07d1eb970d94b3d3',
'src/third_party/WebKit': 'src/third_party/WebKit':
Var('chromium_git') + '/chromium/blink.git' + '@' + Var('webkit_revision'), Var('chromium_git') + '/chromium/blink.git' + '@' + Var('webkit_revision'),
......
...@@ -86,20 +86,16 @@ bool GetTracingOptions(const std::string& data64, ...@@ -86,20 +86,16 @@ bool GetTracingOptions(const std::string& data64,
options_ok &= options->GetString("categoryFilter", &category_filter_string); options_ok &= options->GetString("categoryFilter", &category_filter_string);
*category_filter = base::trace_event::CategoryFilter(category_filter_string); *category_filter = base::trace_event::CategoryFilter(category_filter_string);
std::string record_mode;
options_ok &=
options->GetString("tracingRecordMode", &record_mode);
options_ok &= tracing_options->SetFromString(record_mode);
options_ok &= options->GetBoolean("useSystemTracing", options_ok &= options->GetBoolean("useSystemTracing",
&tracing_options->enable_systrace); &tracing_options->enable_systrace);
options_ok &= options_ok &=
options->GetBoolean("useSampling", &tracing_options->enable_sampling); options->GetBoolean("useSampling", &tracing_options->enable_sampling);
bool use_continuous_tracing;
options_ok &=
options->GetBoolean("useContinuousTracing", &use_continuous_tracing);
if (use_continuous_tracing)
tracing_options->record_mode = base::trace_event::RECORD_CONTINUOUSLY;
else
tracing_options->record_mode = base::trace_event::RECORD_UNTIL_FULL;
if (!options_ok) { if (!options_ok) {
LOG(ERROR) << "Malformed options"; LOG(ERROR) << "Malformed options";
return false; return false;
......
...@@ -7,6 +7,7 @@ import logging ...@@ -7,6 +7,7 @@ import logging
import os import os
import random import random
import shutil import shutil
import StringIO
import sys import sys
import tempfile import tempfile
...@@ -39,15 +40,17 @@ class TraceValue(value_module.Value): ...@@ -39,15 +40,17 @@ class TraceValue(value_module.Value):
self._serialized_file_handle = None self._serialized_file_handle = None
def _GetTempFileHandle(self, trace_data): def _GetTempFileHandle(self, trace_data):
tf = tempfile.NamedTemporaryFile(delete=False, suffix='.html')
if self.page: if self.page:
title = self.page.display_name title = self.page.display_name
else: else:
title = '' title = ''
content = StringIO.StringIO()
trace2html.WriteHTMLForTraceDataToFile( trace2html.WriteHTMLForTraceDataToFile(
[trace_data.GetEventsFor(trace_data_module.CHROME_TRACE_PART)], [trace_data.GetEventsFor(trace_data_module.CHROME_TRACE_PART)],
title, title,
tf) content)
tf = tempfile.NamedTemporaryFile(delete=False, suffix='.html')
tf.write(content.getvalue().encode('utf-8'))
tf.close() tf.close()
return file_handle.FromTempFile(tf) return file_handle.FromTempFile(tf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment