From 59a874858e014100bad2702ae98e4784f94ee185 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 29 Oct 2018 13:27:16 +0000 Subject: [PATCH] cc: Include traced_value.h instead of trace_event_argument.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The header was renamed in a previous CL, this one adjust all includes under //cc/ to use the new header instead. BUG=898787 R=skyostil@chromium.org, enne@chromium.org, danakj@chromium.org Change-Id: I98fafefc6c463c4d5765ef9703fcfdea909ffc2f Reviewed-on: https://chromium-review.googlesource.com/c/1301464 Commit-Queue: David Turner Reviewed-by: Sami Kyöstilä Cr-Commit-Position: refs/heads/master@{#603478} --- cc/animation/animation_host.cc | 2 +- cc/animation/scroll_offset_animations_impl.cc | 2 +- cc/base/devtools_instrumentation.h | 2 +- cc/base/math_util.cc | 2 +- cc/base/region.cc | 2 +- cc/debug/rendering_stats.h | 2 +- cc/input/main_thread_scrolling_reason.cc | 2 +- cc/layers/heads_up_display_layer_impl.cc | 2 +- cc/layers/layer_impl.cc | 2 +- cc/layers/picture_layer_impl.cc | 2 +- cc/layers/surface_layer_impl.cc | 2 +- cc/paint/display_item_list.cc | 2 +- cc/paint/display_item_list_unittest.cc | 2 +- cc/paint/filter_operation.cc | 2 +- cc/paint/filter_operations.cc | 2 +- cc/raster/bitmap_raster_buffer_provider.cc | 2 +- cc/raster/zero_copy_raster_buffer_provider.cc | 2 +- cc/scheduler/begin_frame_tracker.h | 2 +- cc/scheduler/scheduler.cc | 2 +- cc/scheduler/scheduler_settings.cc | 2 +- cc/scheduler/scheduler_state_machine.cc | 2 +- cc/test/mock_layer_client.h | 2 +- cc/tiles/picture_layer_tiling.cc | 2 +- cc/tiles/tile.cc | 2 +- cc/tiles/tile_draw_info.h | 2 +- cc/tiles/tile_manager.cc | 2 +- cc/tiles/tile_priority.cc | 2 +- cc/tiles/tile_priority.h | 2 +- cc/trees/clip_node.cc | 6 ++++-- cc/trees/clip_node.h | 1 + cc/trees/effect_node.cc | 4 ++-- cc/trees/element_id.cc | 2 +- cc/trees/layer_tree_host.cc | 2 +- cc/trees/layer_tree_host_impl.cc | 2 +- cc/trees/layer_tree_impl.cc | 2 +- cc/trees/property_tree.cc | 2 +- cc/trees/proxy_impl.cc | 2 +- cc/trees/proxy_main.cc | 2 +- cc/trees/scroll_node.cc | 6 ++++-- cc/trees/scroll_node.h | 1 + cc/trees/transform_node.cc | 4 ++-- cc/trees/transform_node.h | 1 + 42 files changed, 50 insertions(+), 43 deletions(-) diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc index 696e69e8e9b12e..b78c578afd6162 100644 --- a/cc/animation/animation_host.cc +++ b/cc/animation/animation_host.cc @@ -12,7 +12,7 @@ #include "base/memory/ptr_util.h" #include "base/stl_util.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/animation/animation.h" #include "cc/animation/animation_delegate.h" #include "cc/animation/animation_events.h" diff --git a/cc/animation/scroll_offset_animations_impl.cc b/cc/animation/scroll_offset_animations_impl.cc index 7c11c2d5281168..ec4bafbd264fa5 100644 --- a/cc/animation/scroll_offset_animations_impl.cc +++ b/cc/animation/scroll_offset_animations_impl.cc @@ -5,7 +5,7 @@ #include "cc/animation/scroll_offset_animations_impl.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_id_provider.h" #include "cc/animation/animation_timeline.h" diff --git a/cc/base/devtools_instrumentation.h b/cc/base/devtools_instrumentation.h index 0562877ed4a493..e0b9314fe70b6e 100644 --- a/cc/base/devtools_instrumentation.h +++ b/cc/base/devtools_instrumentation.h @@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/base_export.h" namespace cc { diff --git a/cc/base/math_util.cc b/cc/base/math_util.cc index 7ac7fb42f5e95e..d212a733474f14 100644 --- a/cc/base/math_util.cc +++ b/cc/base/math_util.cc @@ -11,7 +11,7 @@ #include #endif -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" #include "ui/gfx/geometry/angle_conversions.h" #include "ui/gfx/geometry/quad_f.h" diff --git a/cc/base/region.cc b/cc/base/region.cc index 5653634e8fa28c..3187693ce30b9d 100644 --- a/cc/base/region.cc +++ b/cc/base/region.cc @@ -6,7 +6,7 @@ #include -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" #include "cc/base/simple_enclosed_region.h" #include "ui/gfx/geometry/vector2d.h" diff --git a/cc/debug/rendering_stats.h b/cc/debug/rendering_stats.h index 156db0c15b9a2a..4fe3f55336d406 100644 --- a/cc/debug/rendering_stats.h +++ b/cc/debug/rendering_stats.h @@ -11,7 +11,7 @@ #include #include "base/time/time.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" #include "cc/debug/debug_export.h" diff --git a/cc/input/main_thread_scrolling_reason.cc b/cc/input/main_thread_scrolling_reason.cc index d5332653c77f32..728708ce7763f3 100644 --- a/cc/input/main_thread_scrolling_reason.cc +++ b/cc/input/main_thread_scrolling_reason.cc @@ -5,7 +5,7 @@ #include "cc/input/main_thread_scrolling_reason.h" #include "base/stl_util.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" namespace cc { diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc index 1c4e20458d128c..7dcb64df808aad 100644 --- a/cc/layers/heads_up_display_layer_impl.cc +++ b/cc/layers/heads_up_display_layer_impl.cc @@ -16,7 +16,7 @@ #include "base/strings/stringprintf.h" #include "base/trace_event/process_memory_dump.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/debug/debug_colors.h" #include "cc/raster/scoped_gpu_raster.h" #include "cc/resources/memory_history.h" diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index 3a4bf4536a87dd..7be072766456c9 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc @@ -14,7 +14,7 @@ #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/math_util.h" #include "cc/base/simple_enclosed_region.h" #include "cc/benchmarks/micro_benchmark_impl.h" diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index 35254ebaddcd84..cd75db217eb7f6 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -15,7 +15,7 @@ #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/time/time.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "build/build_config.h" #include "cc/base/math_util.h" #include "cc/benchmarks/micro_benchmark_impl.h" diff --git a/cc/layers/surface_layer_impl.cc b/cc/layers/surface_layer_impl.cc index 9fbe46c2248f66..4a05173aebcbf9 100644 --- a/cc/layers/surface_layer_impl.cc +++ b/cc/layers/surface_layer_impl.cc @@ -6,7 +6,7 @@ #include -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/debug/debug_colors.h" #include "cc/layers/append_quads_data.h" #include "cc/trees/layer_tree_impl.h" diff --git a/cc/paint/display_item_list.cc b/cc/paint/display_item_list.cc index f2e5259cfc8c8d..cacbe80e5a518b 100644 --- a/cc/paint/display_item_list.cc +++ b/cc/paint/display_item_list.cc @@ -9,7 +9,7 @@ #include #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/math_util.h" #include "cc/debug/picture_debug_util.h" #include "cc/paint/solid_color_analyzer.h" diff --git a/cc/paint/display_item_list_unittest.cc b/cc/paint/display_item_list_unittest.cc index 5bcca13606d28c..0abe50d535c080 100644 --- a/cc/paint/display_item_list_unittest.cc +++ b/cc/paint/display_item_list_unittest.cc @@ -8,7 +8,7 @@ #include -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" #include "cc/paint/filter_operation.h" #include "cc/paint/filter_operations.h" diff --git a/cc/paint/filter_operation.cc b/cc/paint/filter_operation.cc index 221dd572fb7e2a..3357afb235ce0c 100644 --- a/cc/paint/filter_operation.cc +++ b/cc/paint/filter_operation.cc @@ -9,7 +9,7 @@ #include "cc/paint/filter_operation.h" #include "base/numerics/ranges.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" #include "cc/base/math_util.h" #include "ui/gfx/animation/tween.h" diff --git a/cc/paint/filter_operations.cc b/cc/paint/filter_operations.cc index cc2dcc5f7e6275..a7e7312c3817ea 100644 --- a/cc/paint/filter_operations.cc +++ b/cc/paint/filter_operations.cc @@ -9,7 +9,7 @@ #include #include -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" #include "cc/paint/filter_operation.h" #include "ui/gfx/geometry/rect.h" diff --git a/cc/raster/bitmap_raster_buffer_provider.cc b/cc/raster/bitmap_raster_buffer_provider.cc index 1e4e21bb134fea..fc981249cd6826 100644 --- a/cc/raster/bitmap_raster_buffer_provider.cc +++ b/cc/raster/bitmap_raster_buffer_provider.cc @@ -13,7 +13,7 @@ #include "base/strings/stringprintf.h" #include "base/trace_event/process_memory_dump.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/raster/raster_source.h" #include "cc/trees/layer_tree_frame_sink.h" #include "components/viz/common/resources/bitmap_allocation.h" diff --git a/cc/raster/zero_copy_raster_buffer_provider.cc b/cc/raster/zero_copy_raster_buffer_provider.cc index 21010d76efdd25..7007959e559ec5 100644 --- a/cc/raster/zero_copy_raster_buffer_provider.cc +++ b/cc/raster/zero_copy_raster_buffer_provider.cc @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/resources/resource_pool.h" #include "components/viz/client/client_resource_provider.h" #include "components/viz/common/gpu/context_provider.h" diff --git a/cc/scheduler/begin_frame_tracker.h b/cc/scheduler/begin_frame_tracker.h index 33d124ad7e5e7c..e80f7383768067 100644 --- a/cc/scheduler/begin_frame_tracker.h +++ b/cc/scheduler/begin_frame_tracker.h @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/cc_export.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc index fcdbde8a7c008e..d448b5423936aa 100644 --- a/cc/scheduler/scheduler.cc +++ b/cc/scheduler/scheduler.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/devtools_instrumentation.h" #include "cc/scheduler/compositor_timing_history.h" #include "components/viz/common/frame_sinks/delay_based_time_source.h" diff --git a/cc/scheduler/scheduler_settings.cc b/cc/scheduler/scheduler_settings.cc index de38d19ab87c07..9e488fc872511b 100644 --- a/cc/scheduler/scheduler_settings.cc +++ b/cc/scheduler/scheduler_settings.cc @@ -4,7 +4,7 @@ #include "cc/scheduler/scheduler_settings.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" namespace cc { diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc index 327e907e3051d8..f499423ebd29b6 100644 --- a/cc/scheduler/scheduler_state_machine.cc +++ b/cc/scheduler/scheduler_state_machine.cc @@ -7,7 +7,7 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" namespace cc { diff --git a/cc/test/mock_layer_client.h b/cc/test/mock_layer_client.h index 2e4c6dd483fefd..e5ab750d91b63f 100644 --- a/cc/test/mock_layer_client.h +++ b/cc/test/mock_layer_client.h @@ -6,8 +6,8 @@ #define CC_TEST_MOCK_LAYER_CLIENT_H_ #include "base/macros.h" -#include "base/trace_event/trace_event_argument.h" #include "base/trace_event/trace_event_impl.h" +#include "base/trace_event/traced_value.h" #include "cc/layers/layer_client.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc index 13b5f9396f8e68..c16c0bb291bbda 100644 --- a/cc/tiles/picture_layer_tiling.cc +++ b/cc/tiles/picture_layer_tiling.cc @@ -15,7 +15,7 @@ #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/math_util.h" #include "cc/raster/raster_source.h" #include "cc/tiles/prioritized_tile.h" diff --git a/cc/tiles/tile.cc b/cc/tiles/tile.cc index db0ba9f0177a58..96962c83b25084 100644 --- a/cc/tiles/tile.cc +++ b/cc/tiles/tile.cc @@ -10,7 +10,7 @@ #include "base/numerics/safe_conversions.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/math_util.h" #include "cc/tiles/tile_manager.h" #include "components/viz/common/resources/resource_sizes.h" diff --git a/cc/tiles/tile_draw_info.h b/cc/tiles/tile_draw_info.h index aab93183734640..993fcdc1c3095a 100644 --- a/cc/tiles/tile_draw_info.h +++ b/cc/tiles/tile_draw_info.h @@ -7,7 +7,7 @@ #include -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/resources/resource_pool.h" #include "components/viz/common/resources/platform_color.h" #include "components/viz/common/resources/resource_format_utils.h" diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc index 8f076724eb5891..e9b1a799983146 100644 --- a/cc/tiles/tile_manager.cc +++ b/cc/tiles/tile_manager.cc @@ -20,7 +20,7 @@ #include "base/optional.h" #include "base/sys_info.h" #include "base/threading/thread_checker.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/devtools_instrumentation.h" #include "cc/base/histograms.h" #include "cc/layers/picture_layer_impl.h" diff --git a/cc/tiles/tile_priority.cc b/cc/tiles/tile_priority.cc index 0efe51e59728af..7898163053e867 100644 --- a/cc/tiles/tile_priority.cc +++ b/cc/tiles/tile_priority.cc @@ -5,7 +5,7 @@ #include "cc/tiles/tile_priority.h" #include "base/numerics/safe_conversions.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" #include "cc/base/math_util.h" diff --git a/cc/tiles/tile_priority.h b/cc/tiles/tile_priority.h index 15746de650688c..015b0c422ea81d 100644 --- a/cc/tiles/tile_priority.h +++ b/cc/tiles/tile_priority.h @@ -12,7 +12,7 @@ #include #include -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/cc_export.h" namespace base { diff --git a/cc/trees/clip_node.cc b/cc/trees/clip_node.cc index c1a73a952c56ce..edeba2af9d0a7d 100644 --- a/cc/trees/clip_node.cc +++ b/cc/trees/clip_node.cc @@ -2,12 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/trace_event/trace_event_argument.h" +#include "cc/trees/clip_node.h" + #include "cc/base/math_util.h" #include "cc/layers/layer.h" -#include "cc/trees/clip_node.h" #include "cc/trees/property_tree.h" +#include "base/trace_event/traced_value.h" + namespace cc { ClipNode::ClipNode() diff --git a/cc/trees/clip_node.h b/cc/trees/clip_node.h index 5620f9d020c9fd..54e554719e4034 100644 --- a/cc/trees/clip_node.h +++ b/cc/trees/clip_node.h @@ -9,6 +9,7 @@ #include "base/optional.h" #include "cc/cc_export.h" #include "cc/trees/clip_expander.h" +#include "cc/trees/property_tree.h" #include "ui/gfx/geometry/rect_f.h" namespace base { diff --git a/cc/trees/effect_node.cc b/cc/trees/effect_node.cc index f5bc5bb62c84d2..7809564bee3a6d 100644 --- a/cc/trees/effect_node.cc +++ b/cc/trees/effect_node.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/trace_event/trace_event_argument.h" -#include "cc/layers/layer.h" #include "cc/trees/effect_node.h" +#include "base/trace_event/traced_value.h" +#include "cc/layers/layer.h" #include "cc/trees/property_tree.h" namespace cc { diff --git a/cc/trees/element_id.cc b/cc/trees/element_id.cc index 0603ba726c7eb2..95c79a7b19cf61 100644 --- a/cc/trees/element_id.cc +++ b/cc/trees/element_id.cc @@ -9,7 +9,7 @@ #include #include "base/strings/stringprintf.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "base/values.h" namespace cc { diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc index 31c8a2ae232d5d..26f0833fb5a47c 100644 --- a/cc/trees/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.cc @@ -28,7 +28,7 @@ #include "base/threading/thread_task_runner_handle.h" #include "base/timer/elapsed_timer.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "build/build_config.h" #include "cc/base/devtools_instrumentation.h" #include "cc/base/histograms.h" diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 81d2316d2d991c..c346e58a3e0184 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -26,7 +26,7 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "build/build_config.h" #include "cc/base/devtools_instrumentation.h" #include "cc/base/histograms.h" diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc index 21811597fee794..e14b18dee7f2e7 100644 --- a/cc/trees/layer_tree_impl.cc +++ b/cc/trees/layer_tree_impl.cc @@ -20,7 +20,7 @@ #include "base/strings/stringprintf.h" #include "base/timer/elapsed_timer.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/devtools_instrumentation.h" #include "cc/base/histograms.h" #include "cc/base/math_util.h" diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc index 84cdffaafcac0f..00fbcb72ff8f7e 100644 --- a/cc/trees/property_tree.cc +++ b/cc/trees/property_tree.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/numerics/checked_math.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/layers/layer_impl.h" #include "cc/trees/clip_node.h" #include "cc/trees/effect_node.h" diff --git a/cc/trees/proxy_impl.cc b/cc/trees/proxy_impl.cc index 6aff668ee58139..da6a46dfd3cab5 100644 --- a/cc/trees/proxy_impl.cc +++ b/cc/trees/proxy_impl.cc @@ -11,7 +11,7 @@ #include "base/auto_reset.h" #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/devtools_instrumentation.h" #include "cc/benchmarks/benchmark_instrumentation.h" #include "cc/input/browser_controls_offset_manager.h" diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc index c89bd779b18801..ea4ab70d802551 100644 --- a/cc/trees/proxy_main.cc +++ b/cc/trees/proxy_main.cc @@ -8,7 +8,7 @@ #include #include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" +#include "base/trace_event/traced_value.h" #include "cc/base/completion_event.h" #include "cc/base/devtools_instrumentation.h" #include "cc/benchmarks/benchmark_instrumentation.h" diff --git a/cc/trees/scroll_node.cc b/cc/trees/scroll_node.cc index 9a19d4b4b57d44..069c731ae985f6 100644 --- a/cc/trees/scroll_node.cc +++ b/cc/trees/scroll_node.cc @@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/trace_event/trace_event_argument.h" +#include "cc/trees/scroll_node.h" + #include "cc/base/math_util.h" #include "cc/input/main_thread_scrolling_reason.h" #include "cc/layers/layer.h" #include "cc/trees/element_id.h" #include "cc/trees/property_tree.h" -#include "cc/trees/scroll_node.h" + +#include "base/trace_event/traced_value.h" namespace cc { diff --git a/cc/trees/scroll_node.h b/cc/trees/scroll_node.h index b96b696e1b3aad..de9f9343c8dbee 100644 --- a/cc/trees/scroll_node.h +++ b/cc/trees/scroll_node.h @@ -10,6 +10,7 @@ #include "cc/input/overscroll_behavior.h" #include "cc/input/scroll_snap_data.h" #include "cc/paint/filter_operations.h" +#include "cc/trees/element_id.h" #include "ui/gfx/geometry/size.h" namespace base { diff --git a/cc/trees/transform_node.cc b/cc/trees/transform_node.cc index c43fd23fbe1de5..9964f16880b3fe 100644 --- a/cc/trees/transform_node.cc +++ b/cc/trees/transform_node.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/trace_event/trace_event_argument.h" +#include "cc/trees/transform_node.h" +#include "base/trace_event/traced_value.h" #include "cc/base/math_util.h" #include "cc/layers/layer.h" #include "cc/trees/property_tree.h" -#include "cc/trees/transform_node.h" #include "ui/gfx/geometry/point3_f.h" namespace cc { diff --git a/cc/trees/transform_node.h b/cc/trees/transform_node.h index 931867550f87d8..c8f8ebf8505aff 100644 --- a/cc/trees/transform_node.h +++ b/cc/trees/transform_node.h @@ -6,6 +6,7 @@ #define CC_TREES_TRANSFORM_NODE_H_ #include "cc/cc_export.h" +#include "cc/trees/element_id.h" #include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/scroll_offset.h" #include "ui/gfx/transform.h"