From 5fb48ea2e0a95c7fe74e69de0610ba601c910160 Mon Sep 17 00:00:00 2001 From: behdad Date: Mon, 12 Aug 2019 18:15:36 +0000 Subject: [PATCH] Moved metric related files to cc/metrics Bug: chromium:990470 Change-Id: I239ef42d8c9c1c42f27497f720d84ca816d49caf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739387 Reviewed-by: Sadrul Chowdhury Reviewed-by: Robert Flack Commit-Queue: Behdad Bakhshinategh Cr-Commit-Position: refs/heads/master@{#686073} --- cc/BUILD.gn | 24 +-- .../compositor_frame_reporter.cc | 2 +- .../compositor_frame_reporter.h | 6 +- .../compositor_frame_reporter_unittest.cc | 4 +- .../compositor_frame_reporting_controller.cc | 4 +- .../compositor_frame_reporting_controller.h | 8 +- ...tor_frame_reporting_controller_unittest.cc | 2 +- .../compositor_timing_history.cc | 186 +++++++++++++++--- .../compositor_timing_history.h | 6 +- .../compositor_timing_history_unittest.cc | 6 +- .../frame_sequence_tracker.cc | 2 +- .../frame_sequence_tracker.h | 6 +- .../frame_sequence_tracker_unittest.cc | 2 +- cc/scheduler/scheduler.cc | 2 +- ...ke_compositor_frame_reporting_controller.h | 2 +- cc/test/layer_tree_test.cc | 2 +- cc/test/scheduler_test_common.h | 2 +- cc/trees/layer_tree_host_impl.cc | 2 +- cc/trees/layer_tree_host_impl.h | 2 +- cc/trees/proxy_impl.cc | 2 +- cc/trees/single_thread_proxy.cc | 2 +- 21 files changed, 204 insertions(+), 70 deletions(-) rename cc/{scheduler => metrics}/compositor_frame_reporter.cc (99%) rename cc/{scheduler => metrics}/compositor_frame_reporter.h (96%) rename cc/{scheduler => metrics}/compositor_frame_reporter_unittest.cc (99%) rename cc/{scheduler => metrics}/compositor_frame_reporting_controller.cc (98%) rename cc/{scheduler => metrics}/compositor_frame_reporting_controller.h (93%) rename cc/{scheduler => metrics}/compositor_frame_reporting_controller_unittest.cc (99%) rename cc/{scheduler => metrics}/compositor_timing_history.cc (94%) rename cc/{scheduler => metrics}/compositor_timing_history.h (97%) rename cc/{scheduler => metrics}/compositor_timing_history_unittest.cc (98%) rename cc/{trees => metrics}/frame_sequence_tracker.cc (99%) rename cc/{trees => metrics}/frame_sequence_tracker.h (98%) rename cc/{trees => metrics}/frame_sequence_tracker_unittest.cc (98%) diff --git a/cc/BUILD.gn b/cc/BUILD.gn index d9ecd6dfcd93b3..908d30b38c6a57 100644 --- a/cc/BUILD.gn +++ b/cc/BUILD.gn @@ -153,6 +153,14 @@ cc_component("cc") { "layers/video_layer_impl.h", "layers/viewport.cc", "layers/viewport.h", + "metrics/compositor_frame_reporter.cc", + "metrics/compositor_frame_reporter.h", + "metrics/compositor_frame_reporting_controller.cc", + "metrics/compositor_frame_reporting_controller.h", + "metrics/compositor_timing_history.cc", + "metrics/compositor_timing_history.h", + "metrics/frame_sequence_tracker.cc", + "metrics/frame_sequence_tracker.h", "raster/bitmap_raster_buffer_provider.cc", "raster/bitmap_raster_buffer_provider.h", "raster/gpu_raster_buffer_provider.cc", @@ -208,12 +216,6 @@ cc_component("cc") { "scheduler/begin_frame_tracker.cc", "scheduler/begin_frame_tracker.h", "scheduler/commit_earlyout_reason.h", - "scheduler/compositor_frame_reporter.cc", - "scheduler/compositor_frame_reporter.h", - "scheduler/compositor_frame_reporting_controller.cc", - "scheduler/compositor_frame_reporting_controller.h", - "scheduler/compositor_timing_history.cc", - "scheduler/compositor_timing_history.h", "scheduler/draw_result.h", "scheduler/scheduler.cc", "scheduler/scheduler.h", @@ -290,8 +292,6 @@ cc_component("cc") { "trees/effect_node.h", "trees/frame_rate_counter.cc", "trees/frame_rate_counter.h", - "trees/frame_sequence_tracker.cc", - "trees/frame_sequence_tracker.h", "trees/image_animation_controller.cc", "trees/image_animation_controller.h", "trees/latency_info_swap_promise.cc", @@ -633,6 +633,10 @@ cc_test("cc_unittests") { "layers/video_frame_provider_client_impl_unittest.cc", "layers/video_layer_impl_unittest.cc", "layers/viewport_unittest.cc", + "metrics/compositor_frame_reporter_unittest.cc", + "metrics/compositor_frame_reporting_controller_unittest.cc", + "metrics/compositor_timing_history_unittest.cc", + "metrics/frame_sequence_tracker_unittest.cc", "mojo_embedder/async_layer_tree_frame_sink_unittest.cc", "paint/discardable_image_map_unittest.cc", "paint/display_item_list_unittest.cc", @@ -658,9 +662,6 @@ cc_test("cc_unittests") { "raster/synchronous_task_graph_runner_unittest.cc", "raster/task_graph_work_queue_unittest.cc", "resources/resource_pool_unittest.cc", - "scheduler/compositor_frame_reporter_unittest.cc", - "scheduler/compositor_frame_reporting_controller_unittest.cc", - "scheduler/compositor_timing_history_unittest.cc", "scheduler/scheduler_state_machine_unittest.cc", "scheduler/scheduler_unittest.cc", "test/layer_tree_json_parser_unittest.cc", @@ -676,7 +677,6 @@ cc_test("cc_unittests") { "tiles/tile_manager_unittest.cc", "tiles/tile_priority_unittest.cc", "trees/damage_tracker_unittest.cc", - "trees/frame_sequence_tracker_unittest.cc", "trees/image_animation_controller_unittest.cc", "trees/layer_tree_frame_sink_unittest.cc", "trees/layer_tree_host_common_unittest.cc", diff --git a/cc/scheduler/compositor_frame_reporter.cc b/cc/metrics/compositor_frame_reporter.cc similarity index 99% rename from cc/scheduler/compositor_frame_reporter.cc rename to cc/metrics/compositor_frame_reporter.cc index 1a41c5c6fecb12..8d972dc4ff3062 100644 --- a/cc/scheduler/compositor_frame_reporter.cc +++ b/cc/metrics/compositor_frame_reporter.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/scheduler/compositor_frame_reporter.h" +#include "cc/metrics/compositor_frame_reporter.h" #include diff --git a/cc/scheduler/compositor_frame_reporter.h b/cc/metrics/compositor_frame_reporter.h similarity index 96% rename from cc/scheduler/compositor_frame_reporter.h rename to cc/metrics/compositor_frame_reporter.h index ae7d8bba56273a..bed809f114defa 100644 --- a/cc/scheduler/compositor_frame_reporter.h +++ b/cc/metrics/compositor_frame_reporter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_SCHEDULER_COMPOSITOR_FRAME_REPORTER_H_ -#define CC_SCHEDULER_COMPOSITOR_FRAME_REPORTER_H_ +#ifndef CC_METRICS_COMPOSITOR_FRAME_REPORTER_H_ +#define CC_METRICS_COMPOSITOR_FRAME_REPORTER_H_ #include @@ -126,4 +126,4 @@ class CC_EXPORT CompositorFrameReporter { }; } // namespace cc -#endif // CC_SCHEDULER_COMPOSITOR_FRAME_REPORTER_H_" +#endif // CC_METRICS_COMPOSITOR_FRAME_REPORTER_H_" diff --git a/cc/scheduler/compositor_frame_reporter_unittest.cc b/cc/metrics/compositor_frame_reporter_unittest.cc similarity index 99% rename from cc/scheduler/compositor_frame_reporter_unittest.cc rename to cc/metrics/compositor_frame_reporter_unittest.cc index d23a51bebc080e..689a5e03bbdf50 100644 --- a/cc/scheduler/compositor_frame_reporter_unittest.cc +++ b/cc/metrics/compositor_frame_reporter_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/scheduler/compositor_frame_reporter.h" +#include "cc/metrics/compositor_frame_reporter.h" #include "base/test/metrics/histogram_tester.h" -#include "cc/scheduler/compositor_frame_reporting_controller.h" +#include "cc/metrics/compositor_frame_reporting_controller.h" #include "testing/gtest/include/gtest/gtest.h" namespace cc { diff --git a/cc/scheduler/compositor_frame_reporting_controller.cc b/cc/metrics/compositor_frame_reporting_controller.cc similarity index 98% rename from cc/scheduler/compositor_frame_reporting_controller.cc rename to cc/metrics/compositor_frame_reporting_controller.cc index dd74268707afa9..d2b51dd36f19ab 100644 --- a/cc/scheduler/compositor_frame_reporting_controller.cc +++ b/cc/metrics/compositor_frame_reporting_controller.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 "cc/scheduler/compositor_frame_reporting_controller.h" +#include "cc/metrics/compositor_frame_reporting_controller.h" -#include "cc/scheduler/compositor_frame_reporter.h" +#include "cc/metrics/compositor_frame_reporter.h" #include "components/viz/common/quads/compositor_frame_metadata.h" namespace cc { diff --git a/cc/scheduler/compositor_frame_reporting_controller.h b/cc/metrics/compositor_frame_reporting_controller.h similarity index 93% rename from cc/scheduler/compositor_frame_reporting_controller.h rename to cc/metrics/compositor_frame_reporting_controller.h index a481593c59265f..a067cce90ba424 100644 --- a/cc/scheduler/compositor_frame_reporting_controller.h +++ b/cc/metrics/compositor_frame_reporting_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_SCHEDULER_COMPOSITOR_FRAME_REPORTING_CONTROLLER_H_ -#define CC_SCHEDULER_COMPOSITOR_FRAME_REPORTING_CONTROLLER_H_ +#ifndef CC_METRICS_COMPOSITOR_FRAME_REPORTING_CONTROLLER_H_ +#define CC_METRICS_COMPOSITOR_FRAME_REPORTING_CONTROLLER_H_ #include #include @@ -12,7 +12,7 @@ #include "cc/base/base_export.h" #include "cc/base/rolling_time_delta_history.h" #include "cc/cc_export.h" -#include "cc/scheduler/compositor_frame_reporter.h" +#include "cc/metrics/compositor_frame_reporter.h" namespace cc { class RollingTimeDeltaHistory; @@ -90,4 +90,4 @@ class CC_EXPORT CompositorFrameReportingController { }; } // namespace cc -#endif // CC_SCHEDULER_COMPOSITOR_FRAME_REPORTING_CONTROLLER_H_ +#endif // CC_METRICS_COMPOSITOR_FRAME_REPORTING_CONTROLLER_H_ diff --git a/cc/scheduler/compositor_frame_reporting_controller_unittest.cc b/cc/metrics/compositor_frame_reporting_controller_unittest.cc similarity index 99% rename from cc/scheduler/compositor_frame_reporting_controller_unittest.cc rename to cc/metrics/compositor_frame_reporting_controller_unittest.cc index 8210d247bcc946..e12ba768f17c44 100644 --- a/cc/scheduler/compositor_frame_reporting_controller_unittest.cc +++ b/cc/metrics/compositor_frame_reporting_controller_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/scheduler/compositor_frame_reporting_controller.h" +#include "cc/metrics/compositor_frame_reporting_controller.h" #include "base/macros.h" #include "base/test/metrics/histogram_tester.h" diff --git a/cc/scheduler/compositor_timing_history.cc b/cc/metrics/compositor_timing_history.cc similarity index 94% rename from cc/scheduler/compositor_timing_history.cc rename to cc/metrics/compositor_timing_history.cc index 0b509c097da6ff..0e478f818db71f 100644 --- a/cc/scheduler/compositor_timing_history.cc +++ b/cc/metrics/compositor_timing_history.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/scheduler/compositor_timing_history.h" +#include "cc/metrics/compositor_timing_history.h" #include #include @@ -12,7 +12,7 @@ #include "base/stl_util.h" #include "base/trace_event/trace_event.h" #include "cc/debug/rendering_stats_instrumentation.h" -#include "cc/scheduler/compositor_frame_reporting_controller.h" +#include "cc/metrics/compositor_frame_reporting_controller.h" namespace cc { @@ -89,35 +89,170 @@ const double kDrawEstimationPercentile = 90.0; // ~90 VSync aligned UMA buckets. const int kUMAVSyncBuckets[] = { // Powers of two from 0 to 2048 us @ 50% precision - 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, + 1, + 2, + 4, + 8, + 16, + 32, + 64, + 128, + 256, + 512, + 1024, + 2048, // Every 8 Hz from 256 Hz to 128 Hz @ 3-6% precision - 3906, 4032, 4167, 4310, 4464, 4630, 4808, 5000, 5208, 5435, 5682, 5952, - 6250, 6579, 6944, 7353, + 3906, + 4032, + 4167, + 4310, + 4464, + 4630, + 4808, + 5000, + 5208, + 5435, + 5682, + 5952, + 6250, + 6579, + 6944, + 7353, // Every 4 Hz from 128 Hz to 64 Hz @ 3-6% precision - 7813, 8065, 8333, 8621, 8929, 9259, 9615, 10000, 10417, 10870, 11364, 11905, - 12500, 13158, 13889, 14706, + 7813, + 8065, + 8333, + 8621, + 8929, + 9259, + 9615, + 10000, + 10417, + 10870, + 11364, + 11905, + 12500, + 13158, + 13889, + 14706, // Every 2 Hz from 64 Hz to 32 Hz @ 3-6% precision - 15625, 16129, 16667, 17241, 17857, 18519, 19231, 20000, 20833, 21739, 22727, - 23810, 25000, 26316, 27778, 29412, + 15625, + 16129, + 16667, + 17241, + 17857, + 18519, + 19231, + 20000, + 20833, + 21739, + 22727, + 23810, + 25000, + 26316, + 27778, + 29412, // Every 1 Hz from 32 Hz to 1 Hz @ 3-33% precision - 31250, 32258, 33333, 34483, 35714, 37037, 38462, 40000, 41667, 43478, 45455, - 47619, 50000, 52632, 55556, 58824, 62500, 66667, 71429, 76923, 83333, 90909, - 100000, 111111, 125000, 142857, 166667, 200000, 250000, 333333, 500000, + 31250, + 32258, + 33333, + 34483, + 35714, + 37037, + 38462, + 40000, + 41667, + 43478, + 45455, + 47619, + 50000, + 52632, + 55556, + 58824, + 62500, + 66667, + 71429, + 76923, + 83333, + 90909, + 100000, + 111111, + 125000, + 142857, + 166667, + 200000, + 250000, + 333333, + 500000, // Powers of two from 1s to 32s @ 50% precision - 1000000, 2000000, 4000000, 8000000, 16000000, 32000000, + 1000000, + 2000000, + 4000000, + 8000000, + 16000000, + 32000000, }; // ~50 UMA buckets with high precision from ~100 us to 1s. const int kUMADurationBuckets[] = { // Powers of 2 from 1 us to 64 us @ 50% precision. - 1, 2, 4, 8, 16, 32, 64, + 1, + 2, + 4, + 8, + 16, + 32, + 64, // 1.25^20, 1.25^21, ..., 1.25^62 @ 20% precision. - 87, 108, 136, 169, 212, 265, 331, 414, 517, 646, 808, 1010, 1262, 1578, - 1972, 2465, 3081, 3852, 4815, 6019, 7523, 9404, 11755, 14694, 18367, 22959, - 28699, 35873, 44842, 56052, 70065, 87581, 109476, 136846, 171057, 213821, - 267276, 334096, 417619, 522024, 652530, 815663, 1019579, + 87, + 108, + 136, + 169, + 212, + 265, + 331, + 414, + 517, + 646, + 808, + 1010, + 1262, + 1578, + 1972, + 2465, + 3081, + 3852, + 4815, + 6019, + 7523, + 9404, + 11755, + 14694, + 18367, + 22959, + 28699, + 35873, + 44842, + 56052, + 70065, + 87581, + 109476, + 136846, + 171057, + 213821, + 267276, + 334096, + 417619, + 522024, + 652530, + 815663, + 1019579, // Powers of 2 from 2s to 32s @ 50% precision. - 2000000, 4000000, 8000000, 16000000, 32000000, + 2000000, + 4000000, + 8000000, + 16000000, + 32000000, }; #define UMA_HISTOGRAM_CUSTOM_TIMES_VSYNC_ALIGNED(name, sample) \ @@ -824,13 +959,12 @@ void CompositorTimingHistory::DrawAborted() { active_tree_main_frame_time_ = base::TimeTicks(); } -void CompositorTimingHistory::DidDraw( - bool used_new_active_tree, - base::TimeTicks impl_frame_time, - size_t composited_animations_count, - size_t main_thread_animations_count, - bool current_frame_had_raf, - bool next_frame_has_pending_raf) { +void CompositorTimingHistory::DidDraw(bool used_new_active_tree, + base::TimeTicks impl_frame_time, + size_t composited_animations_count, + size_t main_thread_animations_count, + bool current_frame_had_raf, + bool next_frame_has_pending_raf) { DCHECK_NE(base::TimeTicks(), draw_start_time_); base::TimeTicks draw_end_time = Now(); base::TimeDelta draw_duration = draw_end_time - draw_start_time_; diff --git a/cc/scheduler/compositor_timing_history.h b/cc/metrics/compositor_timing_history.h similarity index 97% rename from cc/scheduler/compositor_timing_history.h rename to cc/metrics/compositor_timing_history.h index 7dff0c9335c23f..8f83b3be7fab2a 100644 --- a/cc/scheduler/compositor_timing_history.h +++ b/cc/metrics/compositor_timing_history.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_ -#define CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_ +#ifndef CC_METRICS_COMPOSITOR_TIMING_HISTORY_H_ +#define CC_METRICS_COMPOSITOR_TIMING_HISTORY_H_ #include @@ -180,4 +180,4 @@ class CC_EXPORT CompositorTimingHistory { } // namespace cc -#endif // CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_ +#endif // CC_METRICS_COMPOSITOR_TIMING_HISTORY_H_ diff --git a/cc/scheduler/compositor_timing_history_unittest.cc b/cc/metrics/compositor_timing_history_unittest.cc similarity index 98% rename from cc/scheduler/compositor_timing_history_unittest.cc rename to cc/metrics/compositor_timing_history_unittest.cc index 187c65b1a486e3..c0fba798c2e52b 100644 --- a/cc/scheduler/compositor_timing_history_unittest.cc +++ b/cc/metrics/compositor_timing_history_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/scheduler/compositor_timing_history.h" +#include "cc/metrics/compositor_timing_history.h" #include "base/test/metrics/histogram_tester.h" #include "cc/debug/rendering_stats_instrumentation.h" @@ -68,8 +68,8 @@ class CompositorTimingHistoryTest : public testing::Test { timing_history_.WillDraw(); AdvanceNowBy(base::TimeDelta::FromMicroseconds(advance_ms)); timing_history_.DidDraw(true, Now(), composited_animations_count, - main_thread_animations_count, - current_frame_had_raf, next_frame_has_pending_raf); + main_thread_animations_count, current_frame_had_raf, + next_frame_has_pending_raf); } void DrawImplFrame(int advance_ms, diff --git a/cc/trees/frame_sequence_tracker.cc b/cc/metrics/frame_sequence_tracker.cc similarity index 99% rename from cc/trees/frame_sequence_tracker.cc rename to cc/metrics/frame_sequence_tracker.cc index 1747564f29111b..08e07573cbd128 100644 --- a/cc/trees/frame_sequence_tracker.cc +++ b/cc/metrics/frame_sequence_tracker.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/trees/frame_sequence_tracker.h" +#include "cc/metrics/frame_sequence_tracker.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_macros.h" diff --git a/cc/trees/frame_sequence_tracker.h b/cc/metrics/frame_sequence_tracker.h similarity index 98% rename from cc/trees/frame_sequence_tracker.h rename to cc/metrics/frame_sequence_tracker.h index 57b370eb316742..9b5981cbf13d87 100644 --- a/cc/trees/frame_sequence_tracker.h +++ b/cc/metrics/frame_sequence_tracker.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CC_TREES_FRAME_SEQUENCE_TRACKER_H_ -#define CC_TREES_FRAME_SEQUENCE_TRACKER_H_ +#ifndef CC_METRICS_FRAME_SEQUENCE_TRACKER_H_ +#define CC_METRICS_FRAME_SEQUENCE_TRACKER_H_ #include #include @@ -235,4 +235,4 @@ class CC_EXPORT FrameSequenceTracker { } // namespace cc -#endif // CC_TREES_FRAME_SEQUENCE_TRACKER_H_ +#endif // CC_METRICS_FRAME_SEQUENCE_TRACKER_H_ diff --git a/cc/trees/frame_sequence_tracker_unittest.cc b/cc/metrics/frame_sequence_tracker_unittest.cc similarity index 98% rename from cc/trees/frame_sequence_tracker_unittest.cc rename to cc/metrics/frame_sequence_tracker_unittest.cc index 1de4c9c38a9d1e..51705a5a6c065d 100644 --- a/cc/trees/frame_sequence_tracker_unittest.cc +++ b/cc/metrics/frame_sequence_tracker_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "cc/trees/frame_sequence_tracker.h" +#include "cc/metrics/frame_sequence_tracker.h" #include "base/macros.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc index 61073cebb06b52..6a14640dcbb0f5 100644 --- a/cc/scheduler/scheduler.cc +++ b/cc/scheduler/scheduler.cc @@ -13,7 +13,7 @@ #include "base/trace_event/trace_event.h" #include "base/trace_event/traced_value.h" #include "cc/base/devtools_instrumentation.h" -#include "cc/scheduler/compositor_timing_history.h" +#include "cc/metrics/compositor_timing_history.h" #include "components/viz/common/frame_sinks/delay_based_time_source.h" namespace cc { diff --git a/cc/test/fake_compositor_frame_reporting_controller.h b/cc/test/fake_compositor_frame_reporting_controller.h index 13cd6e7d95161f..57176a1e8a45f9 100644 --- a/cc/test/fake_compositor_frame_reporting_controller.h +++ b/cc/test/fake_compositor_frame_reporting_controller.h @@ -5,7 +5,7 @@ #ifndef CC_TEST_FAKE_COMPOSITOR_FRAME_REPORTING_CONTROLLER_H_ #define CC_TEST_FAKE_COMPOSITOR_FRAME_REPORTING_CONTROLLER_H_ -#include "cc/scheduler/compositor_frame_reporting_controller.h" +#include "cc/metrics/compositor_frame_reporting_controller.h" namespace cc { // This class is to be used for testing, during cases where the DCHECKs won't diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 2f9ec283558e49..6ae2e235e9afa1 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -23,7 +23,7 @@ #include "cc/input/input_handler.h" #include "cc/layers/layer.h" #include "cc/layers/layer_impl.h" -#include "cc/scheduler/compositor_timing_history.h" +#include "cc/metrics/compositor_timing_history.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_compositor_frame_reporting_controller.h" #include "cc/test/fake_layer_tree_host_client.h" diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h index 93d28af4c39f08..2f6e2086daf4e5 100644 --- a/cc/test/scheduler_test_common.h +++ b/cc/test/scheduler_test_common.h @@ -11,7 +11,7 @@ #include #include "base/time/time.h" -#include "cc/scheduler/compositor_timing_history.h" +#include "cc/metrics/compositor_timing_history.h" #include "cc/scheduler/scheduler.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index d4713f66b8bd2d..d0bf97defd13fd 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -51,6 +51,7 @@ #include "cc/layers/scrollbar_layer_impl_base.h" #include "cc/layers/surface_layer_impl.h" #include "cc/layers/viewport.h" +#include "cc/metrics/compositor_frame_reporting_controller.h" #include "cc/paint/paint_worklet_layer_painter.h" #include "cc/raster/bitmap_raster_buffer_provider.h" #include "cc/raster/gpu_raster_buffer_provider.h" @@ -61,7 +62,6 @@ #include "cc/resources/memory_history.h" #include "cc/resources/resource_pool.h" #include "cc/resources/ui_resource_bitmap.h" -#include "cc/scheduler/compositor_frame_reporting_controller.h" #include "cc/tiles/eviction_tile_priority_queue.h" #include "cc/tiles/frame_viewer_instrumentation.h" #include "cc/tiles/gpu_image_decode_cache.h" diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index cb4b0f0bd37cc4..9f04d1c9c4c8be 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -27,6 +27,7 @@ #include "cc/input/scrollbar_animation_controller.h" #include "cc/input/scrollbar_controller.h" #include "cc/layers/layer_collections.h" +#include "cc/metrics/frame_sequence_tracker.h" #include "cc/paint/paint_worklet_job.h" #include "cc/resources/ui_resource_client.h" #include "cc/scheduler/begin_frame_tracker.h" @@ -37,7 +38,6 @@ #include "cc/tiles/decoded_image_tracker.h" #include "cc/tiles/image_decode_cache.h" #include "cc/tiles/tile_manager.h" -#include "cc/trees/frame_sequence_tracker.h" #include "cc/trees/layer_tree_frame_sink_client.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_mutator.h" diff --git a/cc/trees/proxy_impl.cc b/cc/trees/proxy_impl.cc index 2e69eddc64e095..ed8eb19667d818 100644 --- a/cc/trees/proxy_impl.cc +++ b/cc/trees/proxy_impl.cc @@ -16,8 +16,8 @@ #include "cc/base/devtools_instrumentation.h" #include "cc/benchmarks/benchmark_instrumentation.h" #include "cc/input/browser_controls_offset_manager.h" +#include "cc/metrics/compositor_timing_history.h" #include "cc/paint/paint_worklet_layer_painter.h" -#include "cc/scheduler/compositor_timing_history.h" #include "cc/trees/layer_tree_frame_sink.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_impl.h" diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc index 4fc0e4beb47b9b..3bbaca8020d608 100644 --- a/cc/trees/single_thread_proxy.cc +++ b/cc/trees/single_thread_proxy.cc @@ -11,10 +11,10 @@ #include "cc/base/devtools_instrumentation.h" #include "cc/benchmarks/benchmark_instrumentation.h" #include "cc/input/browser_controls_offset_manager.h" +#include "cc/metrics/compositor_timing_history.h" #include "cc/paint/paint_worklet_layer_painter.h" #include "cc/resources/ui_resource_manager.h" #include "cc/scheduler/commit_earlyout_reason.h" -#include "cc/scheduler/compositor_timing_history.h" #include "cc/scheduler/scheduler.h" #include "cc/trees/latency_info_swap_promise.h" #include "cc/trees/layer_tree_frame_sink.h"