summaryrefslogtreecommitdiff
path: root/chromium/third_party/catapult
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:22:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-09 15:11:45 +0000
commit2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch)
treee75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/third_party/catapult
parenta4f3d46271c57e8155ba912df46a05559d14726e (diff)
downloadqtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/catapult')
-rw-r--r--chromium/third_party/catapult/telemetry/telemetry.gyp16
-rw-r--r--chromium/third_party/catapult/telemetry/telemetry.isolate19
-rw-r--r--chromium/third_party/catapult/tracing/trace_viewer.gypi100
3 files changed, 97 insertions, 38 deletions
diff --git a/chromium/third_party/catapult/telemetry/telemetry.gyp b/chromium/third_party/catapult/telemetry/telemetry.gyp
new file mode 100644
index 00000000000..02ecd8d6aee
--- /dev/null
+++ b/chromium/third_party/catapult/telemetry/telemetry.gyp
@@ -0,0 +1,16 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'targets': [
+ {
+ 'target_name': 'bitmaptools',
+ 'type': 'executable',
+ 'sources': [
+ 'telemetry/internal/image_processing/bitmaptools.cc',
+ ],
+ 'toolsets': ['host'],
+ },
+ ],
+}
diff --git a/chromium/third_party/catapult/telemetry/telemetry.isolate b/chromium/third_party/catapult/telemetry/telemetry.isolate
new file mode 100644
index 00000000000..829efecde29
--- /dev/null
+++ b/chromium/third_party/catapult/telemetry/telemetry.isolate
@@ -0,0 +1,19 @@
+# Copyright (c) 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+ 'conditions': [
+ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'files': [
+ # For now, just include the whole catapult directory.
+ # TODO(nednguyen, aiolos): only include what telemetry needs.
+ # https://github.com/catapult-project/catapult/issues/1953
+ '../',
+ # For Telemetry's screenshot support.
+ '<(PRODUCT_DIR)/bitmaptools<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
+ ]
+}
diff --git a/chromium/third_party/catapult/tracing/trace_viewer.gypi b/chromium/third_party/catapult/tracing/trace_viewer.gypi
index 7d6052b7bdf..1f81caed911 100644
--- a/chromium/third_party/catapult/tracing/trace_viewer.gypi
+++ b/chromium/third_party/catapult/tracing/trace_viewer.gypi
@@ -57,22 +57,12 @@
'tracing/base/statistics.html',
'tracing/base/task.html',
'tracing/base/timing.html',
- 'tracing/base/units/generic_table.html',
- 'tracing/base/units/histogram.html',
- 'tracing/base/units/scalar.html',
- 'tracing/base/units/time_display_mode.html',
- 'tracing/base/units/time_duration.html',
- 'tracing/base/units/time_stamp.html',
- 'tracing/base/units/units.html',
'tracing/base/utils.html',
'tracing/core/auditor.html',
'tracing/core/filter.html',
'tracing/core/scripting_controller.html',
'tracing/core/scripting_object.html',
- 'tracing/extras/android/android_app.html',
'tracing/extras/android/android_auditor.html',
- 'tracing/extras/android/android_model_helper.html',
- 'tracing/extras/android/android_surface_flinger.html',
'tracing/extras/chrome/cc/cc.html',
'tracing/extras/chrome/cc/constants.html',
'tracing/extras/chrome/cc/debug_colors.html',
@@ -90,15 +80,13 @@
'tracing/extras/chrome/cc/tile_coverage_rect.html',
'tracing/extras/chrome/cc/util.html',
'tracing/extras/chrome/chrome_auditor.html',
- 'tracing/extras/chrome/chrome_browser_helper.html',
- 'tracing/extras/chrome/chrome_gpu_helper.html',
- 'tracing/extras/chrome/chrome_model_helper.html',
- 'tracing/extras/chrome/chrome_process_helper.html',
- 'tracing/extras/chrome/chrome_renderer_helper.html',
'tracing/extras/chrome/chrome_user_friendly_category_driver.html',
+ 'tracing/extras/chrome/frame_tree_node.html',
'tracing/extras/chrome/gpu/gpu_async_slice.html',
'tracing/extras/chrome/gpu/state.html',
'tracing/extras/chrome/layout_object.html',
+ 'tracing/extras/chrome/layout_tree.html',
+ 'tracing/extras/chrome/render_frame.html',
'tracing/extras/chrome_config.html',
'tracing/extras/importer/android/event_log_importer.html',
'tracing/extras/importer/battor_importer.html',
@@ -146,14 +134,6 @@
'tracing/extras/measure/measure_async_slice.html',
'tracing/extras/net/net.html',
'tracing/extras/net/net_async_slice.html',
- 'tracing/extras/rail/animation_interaction_record.html',
- 'tracing/extras/rail/idle_interaction_record.html',
- 'tracing/extras/rail/load_interaction_record.html',
- 'tracing/extras/rail/proto_ir.html',
- 'tracing/extras/rail/rail_interaction_record.html',
- 'tracing/extras/rail/rail_ir_finder.html',
- 'tracing/extras/rail/rail_score.html',
- 'tracing/extras/rail/response_interaction_record.html',
'tracing/extras/system_stats/system_stats_snapshot.html',
'tracing/extras/systrace_config.html',
'tracing/extras/tquery/context.html',
@@ -164,20 +144,41 @@
'tracing/extras/tquery/filter_has_duration.html',
'tracing/extras/tquery/filter_has_title.html',
'tracing/extras/tquery/filter_is_top_level.html',
+ 'tracing/extras/tquery/filter_not.html',
'tracing/extras/tquery/tquery.html',
'tracing/extras/vsync/vsync_auditor.html',
'tracing/importer/empty_importer.html',
+ 'tracing/importer/find_input_expectations.html',
+ 'tracing/importer/find_load_expectations.html',
'tracing/importer/import.html',
'tracing/importer/importer.html',
+ 'tracing/importer/proto_expectation.html',
'tracing/importer/simple_line_reader.html',
+ 'tracing/importer/user_model_builder.html',
+ 'tracing/metrics/all_metrics.html',
+ 'tracing/metrics/metric_registry.html',
+ 'tracing/metrics/sample_metric.html',
+ 'tracing/metrics/system_health/efficiency_metric.html',
+ 'tracing/metrics/system_health/first_paint_metric.html',
+ 'tracing/metrics/system_health/hazard_metric.html',
+ 'tracing/metrics/system_health/memory_metric.html',
+ 'tracing/metrics/system_health/responsiveness_metric.html',
+ 'tracing/metrics/system_health/system_health_metrics.html',
+ 'tracing/metrics/system_health/utils.html',
+ 'tracing/metrics/tracing_metric.html',
+ 'tracing/metrics/v8/execution_metric.html',
+ 'tracing/metrics/v8/v8_metrics.html',
+ 'tracing/metrics/value_list.html',
'tracing/model/activity.html',
'tracing/model/alert.html',
'tracing/model/annotation.html',
'tracing/model/async_slice.html',
'tracing/model/async_slice_group.html',
- 'tracing/model/attribute.html',
+ 'tracing/model/clock_sync_manager.html',
+ 'tracing/model/clock_sync_record.html',
'tracing/model/comment_box_annotation.html',
'tracing/model/compound_event_selection_state.html',
+ 'tracing/model/constants.html',
'tracing/model/container_memory_dump.html',
'tracing/model/counter.html',
'tracing/model/counter_sample.html',
@@ -194,8 +195,15 @@
'tracing/model/frame.html',
'tracing/model/global_memory_dump.html',
'tracing/model/heap_dump.html',
+ 'tracing/model/helpers/android_app.html',
+ 'tracing/model/helpers/android_model_helper.html',
+ 'tracing/model/helpers/android_surface_flinger.html',
+ 'tracing/model/helpers/chrome_browser_helper.html',
+ 'tracing/model/helpers/chrome_gpu_helper.html',
+ 'tracing/model/helpers/chrome_model_helper.html',
+ 'tracing/model/helpers/chrome_process_helper.html',
+ 'tracing/model/helpers/chrome_renderer_helper.html',
'tracing/model/instant_event.html',
- 'tracing/model/interaction_record.html',
'tracing/model/ir_coverage.html',
'tracing/model/kernel.html',
'tracing/model/location.html',
@@ -203,6 +211,7 @@
'tracing/model/model.html',
'tracing/model/model_indices.html',
'tracing/model/model_settings.html',
+ 'tracing/model/model_stats.html',
'tracing/model/object_collection.html',
'tracing/model/object_instance.html',
'tracing/model/object_snapshot.html',
@@ -214,6 +223,7 @@
'tracing/model/proxy_selectable_item.html',
'tracing/model/rect_annotation.html',
'tracing/model/sample.html',
+ 'tracing/model/scoped_id.html',
'tracing/model/selectable_item.html',
'tracing/model/selection_state.html',
'tracing/model/slice.html',
@@ -226,6 +236,13 @@
'tracing/model/thread_time_slice.html',
'tracing/model/time_to_object_instance_map.html',
'tracing/model/timed_event.html',
+ 'tracing/model/user_model/animation_expectation.html',
+ 'tracing/model/user_model/idle_expectation.html',
+ 'tracing/model/user_model/load_expectation.html',
+ 'tracing/model/user_model/response_expectation.html',
+ 'tracing/model/user_model/user_expectation.html',
+ 'tracing/model/user_model/user_model.html',
+ 'tracing/model/vm_region.html',
'tracing/model/x_marker_annotation.html',
'tracing/ui/analysis/alert_sub_view.html',
'tracing/ui/analysis/analysis_link.html',
@@ -236,6 +253,7 @@
'tracing/ui/analysis/flow_classifier.html',
'tracing/ui/analysis/frame_power_usage_chart.html',
'tracing/ui/analysis/generic_object_view.html',
+ 'tracing/ui/analysis/layout_tree_sub_view.html',
'tracing/ui/analysis/memory_dump_allocator_details_pane.html',
'tracing/ui/analysis/memory_dump_header_pane.html',
'tracing/ui/analysis/memory_dump_heap_details_pane.html',
@@ -251,12 +269,12 @@
'tracing/ui/analysis/multi_flow_event_sub_view.html',
'tracing/ui/analysis/multi_frame_sub_view.html',
'tracing/ui/analysis/multi_instant_event_sub_view.html',
- 'tracing/ui/analysis/multi_interaction_record_sub_view.html',
'tracing/ui/analysis/multi_object_sub_view.html',
'tracing/ui/analysis/multi_power_sample_sub_view.html',
'tracing/ui/analysis/multi_sample_sub_view.html',
'tracing/ui/analysis/multi_thread_slice_sub_view.html',
'tracing/ui/analysis/multi_thread_time_slice_sub_view.html',
+ 'tracing/ui/analysis/multi_user_expectation_sub_view.html',
'tracing/ui/analysis/object_instance_view.html',
'tracing/ui/analysis/object_snapshot_view.html',
'tracing/ui/analysis/power_sample_summary_table.html',
@@ -269,17 +287,17 @@
'tracing/ui/analysis/single_flow_event_sub_view.html',
'tracing/ui/analysis/single_frame_sub_view.html',
'tracing/ui/analysis/single_instant_event_sub_view.html',
- 'tracing/ui/analysis/single_interaction_record_sub_view.html',
'tracing/ui/analysis/single_object_instance_sub_view.html',
'tracing/ui/analysis/single_object_snapshot_sub_view.html',
'tracing/ui/analysis/single_power_sample_sub_view.html',
'tracing/ui/analysis/single_sample_sub_view.html',
'tracing/ui/analysis/single_thread_slice_sub_view.html',
'tracing/ui/analysis/single_thread_time_slice_sub_view.html',
+ 'tracing/ui/analysis/single_user_expectation_sub_view.html',
'tracing/ui/analysis/stack_frame.html',
'tracing/ui/analysis/stacked_pane.html',
'tracing/ui/analysis/stacked_pane_view.html',
- 'tracing/ui/analysis/tab_view.html',
+ 'tracing/ui/analysis/user_expectation_related_samples_table.html',
'tracing/ui/annotations/annotation_view.html',
'tracing/ui/annotations/comment_box_annotation_view.html',
'tracing/ui/annotations/rect_annotation_view.html',
@@ -303,6 +321,9 @@
'tracing/ui/base/event_presenter.html',
'tracing/ui/base/fast_rect_renderer.html',
'tracing/ui/base/favicons.html',
+ 'tracing/ui/base/file.html',
+ 'tracing/ui/base/grouping_table.html',
+ 'tracing/ui/base/grouping_table_groupby_picker.html',
'tracing/ui/base/heading.html',
'tracing/ui/base/hot_key.html',
'tracing/ui/base/hotkey_controller.html',
@@ -318,6 +339,7 @@
'tracing/ui/base/pie_chart.html',
'tracing/ui/base/polymer_utils.html',
'tracing/ui/base/quad_stack_view.html',
+ 'tracing/ui/base/tab_view.html',
'tracing/ui/base/table.html',
'tracing/ui/base/timing_tool.html',
'tracing/ui/base/toolbar_button.html',
@@ -330,12 +352,13 @@
'tracing/ui/extras/about_tracing/inspector_connection.html',
'tracing/ui/extras/about_tracing/inspector_tracing_controller_client.html',
'tracing/ui/extras/about_tracing/profiling_view.html',
- 'tracing/ui/extras/about_tracing/record_and_capture_controller.html',
+ 'tracing/ui/extras/about_tracing/record_controller.html',
'tracing/ui/extras/about_tracing/record_selection_dialog.html',
'tracing/ui/extras/about_tracing/tracing_controller_client.html',
'tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html',
'tracing/ui/extras/chrome/cc/cc.html',
'tracing/ui/extras/chrome/cc/display_item_debugger.html',
+ 'tracing/ui/extras/chrome/cc/display_item_list_item.html',
'tracing/ui/extras/chrome/cc/display_item_list_view.html',
'tracing/ui/extras/chrome/cc/layer_picker.html',
'tracing/ui/extras/chrome/cc/layer_tree_host_impl_view.html',
@@ -356,10 +379,7 @@
'tracing/ui/extras/full_config.html',
'tracing/ui/extras/highlighter/vsync_highlighter.html',
'tracing/ui/extras/lean_config.html',
- 'tracing/ui/extras/rail/rail_score_side_panel.html',
- 'tracing/ui/extras/rail/rail_score_span.html',
'tracing/ui/extras/side_panel/alerts_side_panel.html',
- 'tracing/ui/extras/side_panel/category_summary_side_panel.html',
'tracing/ui/extras/side_panel/input_latency_side_panel.html',
'tracing/ui/extras/side_panel/time_summary_side_panel.html',
'tracing/ui/extras/system_stats/system_stats.html',
@@ -369,6 +389,7 @@
'tracing/ui/find_control.html',
'tracing/ui/find_controller.html',
'tracing/ui/scripting_control.html',
+ 'tracing/ui/side_panel/file_size_stats_side_panel.html',
'tracing/ui/side_panel/side_panel.html',
'tracing/ui/side_panel/side_panel_container.html',
'tracing/ui/timeline_display_transform.html',
@@ -418,13 +439,16 @@
'tracing/ui/tracks/stacked_bars_track.html',
'tracing/ui/tracks/thread_track.html',
'tracing/ui/tracks/track.html',
- 'tracing/ui/units/array_of_numbers_span.html',
- 'tracing/ui/units/generic_table_view.html',
- 'tracing/ui/units/preferred_display_unit.html',
- 'tracing/ui/units/scalar_span.html',
- 'tracing/ui/units/time_duration_span.html',
- 'tracing/ui/units/time_stamp_span.html',
'tracing/ui/view_specific_brushing_state.html',
+ 'tracing/value/generic_table.html',
+ 'tracing/value/numeric.html',
+ 'tracing/value/time_display_mode.html',
+ 'tracing/value/ui/array_of_numbers_span.html',
+ 'tracing/value/ui/generic_table_view.html',
+ 'tracing/value/ui/preferred_display_unit.html',
+ 'tracing/value/ui/scalar_span.html',
+ 'tracing/value/unit.html',
+ 'tracing/value/value.html',
],
'tracing_img_files': [
'tracing/ui/extras/chrome/cc/images/input-event.png',