Skip to content

Commit

Permalink
Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry
Browse files Browse the repository at this point in the history 
This allows blink code to use these types without needing to depend
on ui/gfx.

Split out geometry conversion functions from ui/gfx/skia_util.h into
ui/gfx/geometry/skia_conversions.h.

Split //ui/gfx:geometry_skia into //ui/gfx:gfx_skia and
//ui/gfx/geometry:geometry_skia.

This doesn't change depending code except for cc/.

Bug: 738465
Change-Id: Idb31f605386901ed4b116f6272189c18638d3292
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3200392
Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Owners-Override: danakj <danakj@chromium.org>
Owners-Override: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/main@{#929022}
  • Loading branch information
@wangxianzhu
wangxianzhu committed Oct 7, 2021
1 parent 110e4fd commit 65ef1ad
Show file tree
Hide file tree
Showing 550 changed files with 1,283 additions and 1,355 deletions.
2 changes: 1 addition & 1 deletion android_webview/browser/gfx/aw_gl_surface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/macros.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gl/gl_surface_egl.h"

namespace android_webview {
Expand Down
2 changes: 1 addition & 1 deletion android_webview/browser/gfx/child_frame.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "content/public/browser/android/synchronous_compositor.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"

namespace viz {
class CompositorFrame;
Expand Down
2 changes: 1 addition & 1 deletion android_webview/browser/gfx/hardware_renderer_viz.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
#include "gpu/config/gpu_finch_features.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_share_group.h"
#include "ui/gl/gl_surface_egl.h"
Expand Down
2 changes: 1 addition & 1 deletion android_webview/browser/gfx/parent_compositor_draw_constraints.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define ANDROID_WEBVIEW_BROWSER_GFX_PARENT_COMPOSITOR_DRAW_CONSTRAINTS_H_

#include "ui/gfx/geometry/size.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"

namespace android_webview {

Expand Down
2 changes: 1 addition & 1 deletion ash/accelerators/debug_commands.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/display/manager/display_manager.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/skia_util.h"
#include "ui/views/widget/widget.h"

namespace ash {
Expand Down
2 changes: 1 addition & 1 deletion ash/accessibility/autoclick/autoclick_ring_handler.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "ui/aura/window.h"
#include "ui/compositor/layer.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/views/view.h"

namespace ash {
Expand Down
2 changes: 1 addition & 1 deletion ash/ambient/ui/media_string_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
#include "ui/compositor/paint_recorder.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/font.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/shadow_value.h"
#include "ui/gfx/skia_paint_util.h"
#include "ui/gfx/text_constants.h"
#include "ui/gfx/transform.h"
#include "ui/views/border.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
Expand Down
4 changes: 2 additions & 2 deletions ash/app_list/app_list_presenter_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/display/screen.h"
#include "ui/display/types/display_constants.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/geometry/transform_util.h"
#include "ui/gfx/presentation_feedback.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/transform_util.h"
#include "ui/views/widget/widget.h"
#include "ui/wm/core/transient_window_manager.h"
#include "ui/wm/public/activation_client.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/app_list/app_list_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#include "ui/events/event.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/skia_util.h"
#include "ui/views/accessibility/view_accessibility.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/focus/focus_manager.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/app_list/views/app_drag_icon_proxy.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/geometry/rounded_corners_f.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/transform_util.h"
#include "ui/gfx/geometry/transform_util.h"
#include "ui/views/widget/widget.h"

namespace ash {
Expand Down
2 changes: 1 addition & 1 deletion ash/app_list/views/app_drag_icon_proxy_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/rounded_corners_f.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/views/widget/widget.h"

namespace ash {
Expand Down
2 changes: 1 addition & 1 deletion ash/app_list/views/app_list_item_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
#include "ui/gfx/font_list.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/rounded_corners_f.h"
#include "ui/gfx/geometry/transform_util.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/image/canvas_image_source.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/scoped_canvas.h"
#include "ui/gfx/shadow_value.h"
#include "ui/gfx/skia_paint_util.h"
#include "ui/gfx/transform_util.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/views/accessibility/accessibility_paint_checks.h"
#include "ui/views/background.h"
Expand Down
1 change: 0 additions & 1 deletion ash/app_list/views/app_list_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/interpolated_transform.h"
#include "ui/gfx/skia_util.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/views/accessibility/view_accessibility.h"
#include "ui/views/controls/image_view.h"
Expand Down
1 change: 0 additions & 1 deletion ash/app_list/views/page_switcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "ui/gfx/animation/throb_animation.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/skia_util.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/views/animation/flood_fill_ink_drop_ripple.h"
#include "ui/views/animation/ink_drop.h"
Expand Down
4 changes: 2 additions & 2 deletions ash/app_list/views/paged_apps_grid_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
#include "ui/gfx/geometry/point_f.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/geometry/transform_util.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/geometry/vector2d_f.h"
#include "ui/gfx/skia_paint_util.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/transform_util.h"
#include "ui/views/animation/bounds_animator.h"
#include "ui/views/paint_info.h"
#include "ui/views/view.h"
Expand Down
4 changes: 2 additions & 2 deletions ash/app_list/views/pulsing_block_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include "ui/compositor/layer_animation_sequence.h"
#include "ui/compositor/layer_animator.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/transform_util.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/geometry/transform_util.h"
#include "ui/views/animation/animation_builder.h"
#include "ui/views/animation/animation_sequence_block.h"

Expand Down
2 changes: 1 addition & 1 deletion ash/app_list/views/search_result_page_anchored_dialog.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/views/view.h"
#include "ui/views/window/dialog_delegate.h"
#include "ui/views/window/non_client_view.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/app_list/views/search_result_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_palette.h"
#include "ui/gfx/font.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/skia_util.h"
#include "ui/views/accessibility/accessibility_paint_checks.h"
#include "ui/views/controls/button/image_button.h"
#include "ui/views/controls/image_view.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/app_menu/notification_menu_view_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/events/base_event_utils.h"
#include "ui/events/test/event_generator.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/message_center/public/cpp/notification.h"
#include "ui/views/controls/label.h"
#include "ui/views/test/views_test_base.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/assistant/ui/logo_view/shape/mic_part_shape.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "cc/paint/paint_flags.h"
#include "chromeos/assistant/internal/logo_view/logo_model/mic.h"
#include "ui/gfx/animation/tween.h"
#include "ui/gfx/skia_util.h"
#include "ui/gfx/geometry/skia_conversions.h"

namespace ash {

Expand Down
4 changes: 2 additions & 2 deletions ash/capture_mode/capture_label_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
#include "ui/compositor/layer_animation_element.h"
#include "ui/compositor/layer_animation_sequence.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/geometry/transform_util.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/text_constants.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/transform_util.h"
#include "ui/views/animation/ink_drop.h"
#include "ui/views/background.h"
#include "ui/views/controls/button/label_button.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/capture_mode/capture_mode_session.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/transform_util.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/scoped_canvas.h"
#include "ui/gfx/shadow_value.h"
#include "ui/gfx/skia_paint_util.h"
#include "ui/gfx/transform_util.h"
#include "ui/views/background.h"
#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/label.h"
Expand Down
1 change: 1 addition & 0 deletions ash/clipboard/clipboard_history_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#include "ui/events/event_constants.h"
#include "ui/events/test/event_generator.h"
#include "ui/gfx/skia_util.h"

namespace ash {

Expand Down
2 changes: 1 addition & 1 deletion ash/display/root_window_transformers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "ui/display/screen.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"

namespace ash {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion ash/fast_ink/cursor/cursor_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include "cc/paint/paint_canvas.h"
#include "ui/aura/window.h"
#include "ui/events/base_event_utils.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/presentation_feedback.h"
#include "ui/gfx/skia_util.h"
#include "ui/views/widget/widget.h"

namespace cursor {
Expand Down
2 changes: 1 addition & 1 deletion ash/fast_ink/laser/laser_segment_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "ui/gfx/geometry/angle_conversions.h"
#include "ui/gfx/geometry/point3_f.h"
#include "ui/gfx/geometry/point_f.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/geometry/vector2d_f.h"
#include "ui/gfx/transform.h"

namespace ash {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion ash/host/ash_window_tree_host_mirroring_unified.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "ash/host/ash_window_tree_host_mirroring_delegate.h"
#include "ui/gfx/geometry/point3_f.h"
#include "ui/gfx/geometry/point_conversions.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/platform_window/platform_window_init_properties.h"

namespace ash {
Expand Down
2 changes: 1 addition & 1 deletion ash/host/ash_window_tree_host_platform.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/platform_window/platform_window.h"
#include "ui/platform_window/platform_window_init_properties.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/host/transformer_helper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"

namespace ash {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion ash/hud_display/hud_header_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include "components/vector_icons/vector_icons.h"
#include "ui/base/metadata/metadata_impl_macros.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/skia_util.h"
#include "ui/views/background.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/button.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/keyboard/ui/container_full_width_behavior.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "ui/aura/window.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/wm/core/window_animations.h"

namespace keyboard {
Expand Down
2 changes: 1 addition & 1 deletion ash/login/ui/animated_rounded_image_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "skia/ext/image_operations.h"
#include "third_party/skia/include/core/SkPath.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/skia_util.h"

namespace ash {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion ash/login/ui/arrow_button_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#include "ui/gfx/animation/tween.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/skia_util.h"
#include "ui/views/border.h"
#include "ui/views/controls/focus_ring.h"
#include "ui/views/controls/highlight_path_generator.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/public/cpp/external_arc/message_center/arc_notification_content_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "ui/events/event_handler.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/public/cpp/message_center_constants.h"
#include "ui/message_center/public/cpp/notification.h"
Expand Down
2 changes: 1 addition & 1 deletion ash/public/cpp/network_icon_image_source.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/scoped_canvas.h"
#include "ui/gfx/skia_util.h"
#include "ui/gfx/vector_icon_types.h"
#include "ui/gfx/vector_icon_utils.h"

Expand Down
2 changes: 1 addition & 1 deletion ash/public/cpp/rounded_image_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "skia/ext/image_operations.h"
#include "third_party/skia/include/core/SkPath.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/skia_util.h"

namespace ash {

Expand Down
4 changes: 2 additions & 2 deletions ash/public/cpp/scale_utility.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "ash/public/cpp/scale_utility.h"

#include "ui/gfx/transform.h"
#include "ui/gfx/transform_util.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/geometry/transform_util.h"

namespace ash {

Expand Down
2 changes: 1 addition & 1 deletion ash/rotator/screen_rotation_animation.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "ui/compositor/layer_animation_delegate.h"
#include "ui/gfx/animation/tween.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/interpolated_transform.h"
#include "ui/gfx/transform.h"

namespace ash {

Expand Down
2 changes: 1 addition & 1 deletion ash/rotator/screen_rotation_animation_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "ui/compositor/layer_animator.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/gfx/animation/tween.h"
#include "ui/gfx/transform.h"
#include "ui/gfx/geometry/transform.h"

namespace ash {

Expand Down
Loading

0 comments on commit 65ef1ad

Please sign in to comment.