From 09533404dc063341e5c962413bdb49c775883b9d Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 27 Oct 2021 16:04:16 +0000 Subject: [PATCH] Remove ui/compositor/compositor.h include from ui/compositor/layer.h. A forward declaration, which already exists, is all that is needed. Do IWYU in other files to fix the build. Bug: 242216 Change-Id: I729d2e0305a7a6077a807cd8e28568b326c4dcf4 AX-Relnotes: n/a. Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3246730 Reviewed-by: Scott Violet Owners-Override: Scott Violet Commit-Queue: Lei Zhang Cr-Commit-Position: refs/heads/main@{#935444} --- ash/capture_mode/capture_mode_controller.cc | 1 + ash/display/mirror_window_controller.cc | 1 + ash/fast_ink/fast_ink_host.cc | 1 + ash/rotator/screen_rotation_animator.cc | 1 + ash/shelf/shelf_navigation_widget.cc | 1 + ash/system/holding_space/holding_space_tray_icon.cc | 1 + ash/system/night_light/night_light_controller_impl.cc | 1 + ash/wallpaper/wallpaper_controller_impl.cc | 1 + ash/wm/tablet_mode/tablet_mode_controller.cc | 1 + ash/wm/window_animations.cc | 1 + ash/wm/window_util.cc | 1 + .../ash/arc/screen_capture/arc_screen_capture_session.cc | 1 + chrome/browser/ash/login/ui/login_display_host_webui.cc | 1 + .../extensions/autotest_private/autotest_private_api.cc | 1 + .../picture_in_picture_window_controller_browsertest.cc | 1 + .../ui/views/accessibility/accessibility_focus_highlight.cc | 1 + chrome/browser/ui/views/overlay/overlay_window_views.cc | 1 + chrome/browser/ui/views/tabs/new_tab_button.cc | 1 + chromecast/browser/exo/cast_wm_helper.cc | 1 + chromecast/graphics/accessibility/accessibility_layer.cc | 1 + chromecast/graphics/accessibility/focus_ring_layer.cc | 3 ++- components/exo/notification_surface.cc | 1 + components/exo/surface_tree_host.cc | 1 + components/exo/wm_helper_chromeos.cc | 1 + components/ui_devtools/views/DEPS | 1 + components/ui_devtools/views/element_utility.cc | 2 ++ ui/aura/window_tree_host.cc | 1 + ui/aura/window_tree_host_unittest.cc | 1 + ui/aura/window_unittest.cc | 1 + ui/compositor/debug_utils.cc | 1 + ui/compositor/layer.cc | 1 + ui/compositor/layer.h | 1 - ui/compositor/layer_animator_unittest.cc | 1 + ui/compositor/layer_owner.cc | 4 ++-- ui/compositor/layer_unittest.cc | 1 + ui/views/animation/square_ink_drop_ripple.cc | 1 + ui/views/animation/square_ink_drop_ripple_unittest.cc | 1 + ui/views/controls/scroll_view.cc | 1 + ui/views/controls/scroll_view_unittest.cc | 1 + ui/views/controls/textfield/textfield.cc | 1 + ui/views/widget/desktop_aura/desktop_native_widget_aura.cc | 1 + .../widget/desktop_aura/desktop_window_tree_host_platform.cc | 1 + ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc | 1 + ui/views/widget/native_widget_mac.mm | 1 + 44 files changed, 46 insertions(+), 4 deletions(-) diff --git a/ash/capture_mode/capture_mode_controller.cc b/ash/capture_mode/capture_mode_controller.cc index c912f03bcfd56c..debc3f7f9891e0 100644 --- a/ash/capture_mode/capture_mode_controller.cc +++ b/ash/capture_mode/capture_mode_controller.cc @@ -52,6 +52,7 @@ #include "ui/base/clipboard/clipboard_buffer.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/types/display_constants.h" #include "ui/message_center/message_center.h" diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index 94a10a8ae44343..29166d7c2a3f26 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -26,6 +26,7 @@ #include "ui/aura/window_tree_host.h" #include "ui/base/layout.h" #include "ui/base/ui_base_features.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/display_layout.h" #include "ui/display/display_transform.h" diff --git a/ash/fast_ink/fast_ink_host.cc b/ash/fast_ink/fast_ink_host.cc index e4734c28f63337..2c57a7abd6b1e9 100644 --- a/ash/fast_ink/fast_ink_host.cc +++ b/ash/fast_ink/fast_ink_host.cc @@ -29,6 +29,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_tree_host.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/geometry/rect.h" diff --git a/ash/rotator/screen_rotation_animator.cc b/ash/rotator/screen_rotation_animator.cc index c44f78c8e59be5..a0f67569f02a83 100644 --- a/ash/rotator/screen_rotation_animator.cc +++ b/ash/rotator/screen_rotation_animator.cc @@ -25,6 +25,7 @@ #include "ui/base/class_property.h" #include "ui/compositor/animation_throughput_reporter.h" #include "ui/compositor/callback_layer_animation_observer.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_element.h" #include "ui/compositor/layer_animation_sequence.h" diff --git a/ash/shelf/shelf_navigation_widget.cc b/ash/shelf/shelf_navigation_widget.cc index 6d3325a3c80c39..9ebc444937ec8a 100644 --- a/ash/shelf/shelf_navigation_widget.cc +++ b/ash/shelf/shelf_navigation_widget.cc @@ -25,6 +25,7 @@ #include "base/metrics/histogram_macros.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/animation_throughput_reporter.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" diff --git a/ash/system/holding_space/holding_space_tray_icon.cc b/ash/system/holding_space/holding_space_tray_icon.cc index 0e6a5a4df617d6..13371d11d0ff5a 100644 --- a/ash/system/holding_space/holding_space_tray_icon.cc +++ b/ash/system/holding_space/holding_space_tray_icon.cc @@ -23,6 +23,7 @@ #include "base/i18n/rtl.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/gfx/animation/slide_animation.h" diff --git a/ash/system/night_light/night_light_controller_impl.cc b/ash/system/night_light/night_light_controller_impl.cc index cbfe56ce688342..c324d373f4b5e8 100644 --- a/ash/system/night_light/night_light_controller_impl.cc +++ b/ash/system/night_light/night_light_controller_impl.cc @@ -32,6 +32,7 @@ #include "ui/aura/env.h" #include "ui/aura/window_tree_host.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wallpaper/wallpaper_controller_impl.cc b/ash/wallpaper/wallpaper_controller_impl.cc index 54cd31722255ea..792d93191c971f 100644 --- a/ash/wallpaper/wallpaper_controller_impl.cc +++ b/ash/wallpaper/wallpaper_controller_impl.cc @@ -65,6 +65,7 @@ #include "net/traffic_annotation/network_traffic_annotation.h" #include "services/data_decoder/public/cpp/decode_image.h" #include "third_party/icu/source/i18n/unicode/gregocal.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/manager/display_manager.h" #include "ui/display/manager/managed_display_info.h" diff --git a/ash/wm/tablet_mode/tablet_mode_controller.cc b/ash/wm/tablet_mode/tablet_mode_controller.cc index f0e9e648c4b4f1..605c2db6260621 100644 --- a/ash/wm/tablet_mode/tablet_mode_controller.cc +++ b/ash/wm/tablet_mode/tablet_mode_controller.cc @@ -45,6 +45,7 @@ #include "ui/aura/window_observer.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/display/display.h" diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index caebfb77725466..5880c60c6242d4 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -29,6 +29,7 @@ #include "ui/aura/window_observer.h" #include "ui/base/class_property.h" #include "ui/compositor/animation_throughput_reporter.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_observer.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc index 2352868231afdb..c517fd990e0444 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -39,6 +39,7 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_targeter.h" #include "ui/base/hit_test.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_tree_owner.h" #include "ui/display/display.h" diff --git a/chrome/browser/ash/arc/screen_capture/arc_screen_capture_session.cc b/chrome/browser/ash/arc/screen_capture/arc_screen_capture_session.cc index e9a404fafbc56d..7d34300ce0c446 100644 --- a/chrome/browser/ash/arc/screen_capture/arc_screen_capture_session.cc +++ b/chrome/browser/ash/arc/screen_capture/arc_screen_capture_session.cc @@ -29,6 +29,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" #include "ui/display/manager/display_manager.h" diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.cc b/chrome/browser/ash/login/ui/login_display_host_webui.cc index 372ce8331f5452..ea3020b2899919 100644 --- a/chrome/browser/ash/login/ui/login_display_host_webui.cc +++ b/chrome/browser/ash/login/ui/login_display_host_webui.cc @@ -100,6 +100,7 @@ #include "ui/base/ime/ash/input_method_manager.h" #include "ui/base/ime/ash/input_method_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_observer.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc index 38b892a2146622..7405e21f251a8c 100644 --- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc +++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc @@ -174,6 +174,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/ime/ash/ime_bridge.h" #include "ui/base/ui_base_features.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/throughput_tracker.h" #include "ui/compositor/throughput_tracker_host.h" diff --git a/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc b/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc index 7386386992d825..7bf88e06f06f4b 100644 --- a/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc +++ b/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc @@ -55,6 +55,7 @@ #include "skia/ext/image_operations.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/blink/public/common/web_preferences/web_preferences.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/test/draw_waiter_for_test.h" #include "ui/display/display_switches.h" diff --git a/chrome/browser/ui/views/accessibility/accessibility_focus_highlight.cc b/chrome/browser/ui/views/accessibility/accessibility_focus_highlight.cc index adb17bbc63b854..41d4ff5d051b3f 100644 --- a/chrome/browser/ui/views/accessibility/accessibility_focus_highlight.cc +++ b/chrome/browser/ui/views/accessibility/accessibility_focus_highlight.cc @@ -10,6 +10,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/focused_node_details.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_animation_observer.h" #include "ui/compositor/layer.h" #include "ui/compositor/paint_recorder.h" diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc index 5b0ac4563cbff8..8f25b423b6e628 100644 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc @@ -37,6 +37,7 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" #include "ui/display/screen.h" diff --git a/chrome/browser/ui/views/tabs/new_tab_button.cc b/chrome/browser/ui/views/tabs/new_tab_button.cc index dcf7c8156d9fc2..148658b1db37c7 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.cc +++ b/chrome/browser/ui/views/tabs/new_tab_button.cc @@ -22,6 +22,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/theme_provider.h" +#include "ui/compositor/compositor.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/scoped_canvas.h" #include "ui/views/animation/flood_fill_ink_drop_ripple.h" diff --git a/chromecast/browser/exo/cast_wm_helper.cc b/chromecast/browser/exo/cast_wm_helper.cc index f663967cff9a4d..3522f194b030b5 100644 --- a/chromecast/browser/exo/cast_wm_helper.cc +++ b/chromecast/browser/exo/cast_wm_helper.cc @@ -11,6 +11,7 @@ #include "chromecast/graphics/cast_window_manager_aura.h" #include "ui/aura/client/focus_client.h" #include "ui/base/dragdrop/mojom/drag_drop_types.mojom.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" #include "ui/display/manager/managed_display_info.h" diff --git a/chromecast/graphics/accessibility/accessibility_layer.cc b/chromecast/graphics/accessibility/accessibility_layer.cc index b033ede9717109..4cba5fbb0ee080 100644 --- a/chromecast/graphics/accessibility/accessibility_layer.cc +++ b/chromecast/graphics/accessibility/accessibility_layer.cc @@ -8,6 +8,7 @@ #include "chromecast/graphics/accessibility/accessibility_layer.h" #include "ui/aura/window.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_animation_observer.h" #include "ui/compositor/layer.h" #include "ui/compositor/paint_recorder.h" diff --git a/chromecast/graphics/accessibility/focus_ring_layer.cc b/chromecast/graphics/accessibility/focus_ring_layer.cc index e149e73de444d5..d0a6e52d039fbb 100644 --- a/chromecast/graphics/accessibility/focus_ring_layer.cc +++ b/chromecast/graphics/accessibility/focus_ring_layer.cc @@ -6,9 +6,10 @@ // chromecast. #include "chromecast/graphics/accessibility/focus_ring_layer.h" -#include "chromecast/graphics/accessibility/accessibility_layer.h" +#include "chromecast/graphics/accessibility/accessibility_layer.h" #include "ui/aura/window.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_animation_observer.h" #include "ui/compositor/layer.h" #include "ui/compositor/paint_recorder.h" diff --git a/components/exo/notification_surface.cc b/components/exo/notification_surface.cc index 6054a8648fc81c..584fc8d76115c6 100644 --- a/components/exo/notification_surface.cc +++ b/components/exo/notification_surface.cc @@ -11,6 +11,7 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" #include "ui/aura/window.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/gfx/geometry/rect.h" diff --git a/components/exo/surface_tree_host.cc b/components/exo/surface_tree_host.cc index e1dba1b9422daf..5697caf90c743d 100644 --- a/components/exo/surface_tree_host.cc +++ b/components/exo/surface_tree_host.cc @@ -31,6 +31,7 @@ #include "ui/aura/window_targeter.h" #include "ui/aura/window_tree_host.h" #include "ui/base/cursor/cursor.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" #include "ui/display/screen.h" diff --git a/components/exo/wm_helper_chromeos.cc b/components/exo/wm_helper_chromeos.cc index 39cb82bcec44fc..c89f90c3d36e44 100644 --- a/components/exo/wm_helper_chromeos.cc +++ b/components/exo/wm_helper_chromeos.cc @@ -17,6 +17,7 @@ #include "ui/base/data_transfer_policy/data_transfer_endpoint.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/mojom/drag_drop_types.mojom.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/manager/display_configurator.h" #include "ui/display/manager/display_manager.h" diff --git a/components/ui_devtools/views/DEPS b/components/ui_devtools/views/DEPS index b9bcc8fe7a867b..9655b307ab7ac5 100644 --- a/components/ui_devtools/views/DEPS +++ b/components/ui_devtools/views/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+cc/trees/layer_tree_host.h", "+components/viz/common/surfaces", "+extensions/common/image_util.h", "+third_party/skia/include", diff --git a/components/ui_devtools/views/element_utility.cc b/components/ui_devtools/views/element_utility.cc index bd41f95159c842..e2986bc8aeedec 100644 --- a/components/ui_devtools/views/element_utility.cc +++ b/components/ui_devtools/views/element_utility.cc @@ -5,6 +5,8 @@ #include "components/ui_devtools/views/element_utility.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" +#include "cc/trees/layer_tree_host.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_owner.h" diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc index 27237fb845ab84..df94956c6c0fa8 100644 --- a/ui/aura/window_tree_host.cc +++ b/ui/aura/window_tree_host.cc @@ -28,6 +28,7 @@ #include "ui/base/layout.h" #include "ui/base/ui_base_features.h" #include "ui/base/view_prop.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_switches.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" diff --git a/ui/aura/window_tree_host_unittest.cc b/ui/aura/window_tree_host_unittest.cc index 6842c1845928ac..984f79bd68f4d0 100644 --- a/ui/aura/window_tree_host_unittest.cc +++ b/ui/aura/window_tree_host_unittest.cc @@ -13,6 +13,7 @@ #include "ui/aura/window_tree_host_platform.h" #include "ui/base/ime/input_method.h" #include "ui/base/ui_base_features.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/test/draw_waiter_for_test.h" #include "ui/events/event_rewriter.h" diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 1572f34e41d61e..5a706a5ca639d9 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -39,6 +39,7 @@ #include "ui/aura/window_tree_host.h" #include "ui/base/class_property.h" #include "ui/base/hit_test.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_observer.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" diff --git a/ui/compositor/debug_utils.cc b/ui/compositor/debug_utils.cc index e3d0e0c1ba8cc0..b12728c67be4b8 100644 --- a/ui/compositor/debug_utils.cc +++ b/ui/compositor/debug_utils.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/numerics/math_constants.h" +#include "cc/trees/layer_tree_host.h" #include "ui/compositor/layer.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/point_conversions.h" diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index d0cf50f2ce323b..95d13a1a33cc97 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -27,6 +27,7 @@ #include "cc/trees/layer_tree_settings.h" #include "components/viz/common/frame_sinks/copy_output_request.h" #include "components/viz/common/resources/transferable_resource.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_switches.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/layer_delegate.h" diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h index 1bcb8a7066011c..aa6870d96a1102 100644 --- a/ui/compositor/layer.h +++ b/ui/compositor/layer.h @@ -22,7 +22,6 @@ #include "components/viz/common/resources/transferable_resource.h" #include "components/viz/common/surfaces/subtree_capture_id.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/compositor/compositor.h" #include "ui/compositor/layer_animation_delegate.h" #include "ui/compositor/layer_type.h" #include "ui/gfx/geometry/rect.h" diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc index 636af464a80b9d..dd8d79501b83e8 100644 --- a/ui/compositor/layer_animator_unittest.cc +++ b/ui/compositor/layer_animator_unittest.cc @@ -20,6 +20,7 @@ #include "cc/trees/layer_tree_host.h" #include "cc/trees/mutator_host.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_delegate.h" #include "ui/compositor/layer_animation_element.h" diff --git a/ui/compositor/layer_owner.cc b/ui/compositor/layer_owner.cc index 818281e2779d4d..7154558bce64a9 100644 --- a/ui/compositor/layer_owner.cc +++ b/ui/compositor/layer_owner.cc @@ -9,10 +9,10 @@ // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md #pragma clang max_tokens_here 480000 -#include "ui/compositor/layer.h" - #include +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" namespace ui { diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index 6192d9c17a63c6..e43f5fb276374c 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -46,6 +46,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/khronos/GLES2/gl2.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/compositor_observer.h" #include "ui/compositor/layer_animation_element.h" #include "ui/compositor/layer_animation_observer.h" diff --git a/ui/views/animation/square_ink_drop_ripple.cc b/ui/views/animation/square_ink_drop_ripple.cc index 752bb6879109e9..bd1542c7bbfb0e 100644 --- a/ui/views/animation/square_ink_drop_ripple.cc +++ b/ui/views/animation/square_ink_drop_ripple.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ui/views/animation/square_ink_drop_ripple_unittest.cc b/ui/views/animation/square_ink_drop_ripple_unittest.cc index 541e18b6212799..d24b27a7dc3ecb 100644 --- a/ui/views/animation/square_ink_drop_ripple_unittest.cc +++ b/ui/views/animation/square_ink_drop_ripple_unittest.cc @@ -10,6 +10,7 @@ #include "base/numerics/safe_conversions.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/compositor/compositor.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size_f.h" diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc index ced9efcb84cd03..c8a4d0e07f374d 100644 --- a/ui/views/controls/scroll_view.cc +++ b/ui/views/controls/scroll_view.cc @@ -21,6 +21,7 @@ #include "ui/base/ui_base_features.h" #include "ui/color/color_id.h" #include "ui/color/color_provider.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_type.h" #include "ui/compositor/overscroll/scroll_input_handler.h" diff --git a/ui/views/controls/scroll_view_unittest.cc b/ui/views/controls/scroll_view_unittest.cc index c9886fad053d74..96e9ca1a49e493 100644 --- a/ui/views/controls/scroll_view_unittest.cc +++ b/ui/views/controls/scroll_view_unittest.cc @@ -21,6 +21,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/ui_base_features.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/events/keycodes/keyboard_codes.h" diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc index ac41937671396a..e0be24abc8f38c 100644 --- a/ui/views/controls/textfield/textfield.cc +++ b/ui/views/controls/textfield/textfield.cc @@ -36,6 +36,7 @@ #include "ui/color/color_id.h" #include "ui/color/color_provider.h" #include "ui/compositor/canvas_painter.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/display/display.h" diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index 43cbc4940c2a5b..7295adf79f76dd 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -33,6 +33,7 @@ #include "ui/base/ime/input_method.h" #include "ui/base/ui_base_features.h" #include "ui/base/ui_base_types.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/screen.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc index b683ba2aff0ca7..d7e5869d12ac99 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -18,6 +18,7 @@ #include "ui/aura/client/transient_window_client.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/paint_recorder.h" #include "ui/display/display.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc index 681b36e9e97b52..aceb4c8923c74e 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -30,6 +30,7 @@ #include "ui/base/ui_base_features.h" #include "ui/base/win/event_creation_utils.h" #include "ui/base/win/shell.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/paint_context.h" #include "ui/display/win/dpi.h" diff --git a/ui/views/widget/native_widget_mac.mm b/ui/views/widget/native_widget_mac.mm index 1a066e4e40c00f..dd0fbe37465967 100644 --- a/ui/views/widget/native_widget_mac.mm +++ b/ui/views/widget/native_widget_mac.mm @@ -23,6 +23,7 @@ #import "ui/base/cocoa/window_size_constants.h" #include "ui/base/ime/init/input_method_factory.h" #include "ui/base/ime/input_method.h" +#include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" #include "ui/display/screen.h"