Move ui/gfx to match Chromium

youtube · Mar 26, 2024 · 3901b9e · 3901b9e
2 parents f419de2 + 55319fa
commit 3901b9e
Show file tree

Hide file tree

Showing 816 changed files with 203,440 additions and 35 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -29,6 +29,7 @@ exclude: |
             third_party|
             tools/gyp|
             tools/python|
+            ui|
             url
         )/
         |

diff --git a/cobalt/media/base/pipeline.h b/cobalt/media/base/pipeline.h
@@ -30,7 +30,7 @@
 #include "third_party/chromium/media/base/media_log.h"
 #include "third_party/chromium/media/base/pipeline_status.h"
 #include "third_party/chromium/media/base/ranges.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/base/sbplayer_bridge.h b/cobalt/media/base/sbplayer_bridge.h
@@ -35,7 +35,7 @@
 #include "third_party/chromium/media/base/decoder_buffer.h"
 #include "third_party/chromium/media/base/demuxer_stream.h"
 #include "third_party/chromium/media/base/video_decoder_config.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/base/sbplayer_pipeline.h b/cobalt/media/base/sbplayer_pipeline.h
@@ -42,8 +42,8 @@
 #include "third_party/chromium/media/base/pipeline_status.h"
 #include "third_party/chromium/media/base/ranges.h"
 #include "third_party/chromium/media/base/video_decoder_config.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/base/sbplayer_set_bounds_helper.h b/cobalt/media/base/sbplayer_set_bounds_helper.h
@@ -18,7 +18,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/optional.h"
 #include "base/synchronization/lock.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/player/web_media_player_impl.cc b/cobalt/media/player/web_media_player_impl.cc
@@ -32,9 +32,9 @@
 #include "third_party/chromium/media/base/bind_to_current_loop.h"
 #include "third_party/chromium/media/base/limits.h"
 #include "third_party/chromium/media/base/timestamp_constants.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
 #include "third_party/chromium/media/filters/chunk_demuxer.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/progressive/avc_parser.h b/cobalt/media/progressive/avc_parser.h
@@ -19,8 +19,8 @@
 
 #include "cobalt/media/progressive/progressive_parser.h"
 #include "third_party/chromium/media/base/media_log.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/progressive/demuxer_extension_wrapper.cc b/cobalt/media/progressive/demuxer_extension_wrapper.cc
@@ -30,11 +30,11 @@
 #include "third_party/chromium/media/base/sample_format.h"
 #include "third_party/chromium/media/base/starboard_utils.h"
 #include "third_party/chromium/media/base/video_types.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/color_space.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
 #include "third_party/chromium/media/filters/h264_to_annex_b_bitstream_converter.h"
 #include "third_party/chromium/media/formats/mp4/box_definitions.h"
+#include "ui/gfx/color_space.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/sandbox/format_guesstimator.cc b/cobalt/media/sandbox/format_guesstimator.cc
@@ -39,7 +39,7 @@
 #include "starboard/memory.h"
 #include "starboard/types.h"
 #include "third_party/chromium/media/base/timestamp_constants.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/sandbox/media_sandbox.cc b/cobalt/media/sandbox/media_sandbox.cc
@@ -33,7 +33,7 @@
 #include "cobalt/storage/storage_manager.h"
 #include "cobalt/system_window/system_window.h"
 #include "cobalt/trace_event/scoped_trace_to_file.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/sandbox/media_sandbox.h b/cobalt/media/sandbox/media_sandbox.h
@@ -24,7 +24,7 @@
 #include "cobalt/media/media_module.h"
 #include "cobalt/render_tree/image.h"
 #include "cobalt/render_tree/resource_provider.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/sandbox/web_media_player_helper.cc b/cobalt/media/sandbox/web_media_player_helper.cc
@@ -20,7 +20,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "cobalt/media/file_data_source.h"
 #include "cobalt/media/url_fetcher_data_source.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/sandbox/web_media_player_helper.h b/cobalt/media/sandbox/web_media_player_helper.h
@@ -23,7 +23,7 @@
 #include "cobalt/media/base/decode_target_provider.h"
 #include "cobalt/media/media_module.h"
 #include "cobalt/media/player/web_media_player.h"
-#include "third_party/chromium/media/cobalt/ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 namespace cobalt {

diff --git a/third_party/chromium/media/BUILD.gn b/third_party/chromium/media/BUILD.gn
@@ -224,24 +224,24 @@ component("media") {
     "cobalt/net/cookies/site_for_cookies.h",
 
     #"cobalt/ui/gfx/hdr_metadata.cc",
-    "cobalt/ui/gfx/color_space.h",
-    "cobalt/ui/gfx/color_space_export.h",
-    "cobalt/ui/gfx/geometry/point.cc",
-    "cobalt/ui/gfx/geometry/point.h",
-    "cobalt/ui/gfx/geometry/point3_f.h",
-    "cobalt/ui/gfx/geometry/point_base.h",
-    "cobalt/ui/gfx/geometry/point_f.cc",
-    "cobalt/ui/gfx/geometry/point_f.h",
-    "cobalt/ui/gfx/geometry/rect.h",
-    "cobalt/ui/gfx/geometry/rect_base.h",
-    "cobalt/ui/gfx/geometry/rect_base_impl.h",
-    "cobalt/ui/gfx/geometry/size.h",
-    "cobalt/ui/gfx/geometry/size_base.h",
-    "cobalt/ui/gfx/geometry/size_f.h",
-    "cobalt/ui/gfx/geometry/vector2d.h",
-    "cobalt/ui/gfx/geometry/vector2d_f.h",
-    "cobalt/ui/gfx/hdr_metadata.h",
-    "cobalt/ui/gfx/native_pixmap_handle.h",
+    "//ui/gfx/color_space.h",
+    "//ui/gfx/color_space_export.h",
+    "//ui/gfx/geometry/point.cc",
+    "//ui/gfx/geometry/point.h",
+    "//ui/gfx/geometry/point3_f.h",
+    "//ui/gfx/geometry/point_base.h",
+    "//ui/gfx/geometry/point_f.cc",
+    "//ui/gfx/geometry/point_f.h",
+    "//ui/gfx/geometry/rect.h",
+    "//ui/gfx/geometry/rect_base.h",
+    "//ui/gfx/geometry/rect_base_impl.h",
+    "//ui/gfx/geometry/size.h",
+    "//ui/gfx/geometry/size_base.h",
+    "//ui/gfx/geometry/size_f.h",
+    "//ui/gfx/geometry/vector2d.h",
+    "//ui/gfx/geometry/vector2d_f.h",
+    "//ui/gfx/hdr_metadata.h",
+    "//ui/gfx/native_pixmap_handle.h",
   ]
 
   configs -= [ "//starboard/build/config:size" ]