1 files changed, 99 insertions, 15 deletions

diff --git a/chromium/ui/base/cursor/BUILD.gn b/chromium/ui/base/cursor/BUILD.gn
index e69e571c44b..f16386ecf4a 100644
--- a/chromium/ui/base/cursor/BUILD.gn
+++ b/chromium/ui/base/cursor/BUILD.gn
@@ -4,39 +4,123 @@
 
 import("//build/config/ui.gni")
 
-component("cursor") {
-  output_name = "ui_base_cursor"
-
+# This component was split from :cursor to allow Blink to depend on it without
+# bringing all of //ui/base/cursor.
+component("cursor_base") {
+  output_name = "ui_base_cursor_base"
   sources = [
     "cursor.cc",
     "cursor.h",
+    "cursor_factory.cc",
+    "cursor_factory.h",
     "cursor_size.h",
   ]
-
-  defines = [ "IS_UI_BASE_CURSOR_IMPL" ]
-
+  defines = [ "IS_UI_BASE_CURSOR_BASE_IMPL" ]
   public_deps = [
     "//base",
     "//skia",
     "//ui/base/cursor/mojom:cursor_type",
     "//ui/gfx/geometry",
   ]
-
   deps = [ "//ui/gfx:geometry_skia" ]
 
-  if (use_x11 && use_aura) {
-    sources += [ "cursor_x11.cc" ]
-
-    deps += [ "//ui/base/x" ]
+  if (is_win) {
+    sources += [ "cursor_win.cc" ]
   }
 
-  if (use_ozone) {
+  if (use_x11 || use_ozone) {
     sources += [ "cursor_ozone.cc" ]
+  }
+}
+
+source_set("theme_manager") {
+  sources = [
+    "cursor_theme_manager.cc",
+    "cursor_theme_manager.h",
+    "cursor_theme_manager_observer.h",
+  ]
+  deps = [ "//base" ]
+}
 
-    deps += [ "//ui/ozone:ozone_base" ]
+if (use_aura) {
+  component("cursor") {
+    output_name = "ui_base_cursor"
+    sources = [
+      "cursor_loader.h",
+      "cursor_lookup.cc",
+      "cursor_lookup.h",
+      "cursor_util.cc",
+      "cursor_util.h",
+      "cursors_aura.cc",
+      "cursors_aura.h",
+      "image_cursors.cc",
+      "image_cursors.h",
+    ]
+    defines = [ "IS_UI_BASE_CURSOR_IMPL" ]
+    public_deps = [
+      ":cursor_base",
+      "//base",
+      "//ui/base/cursor/mojom:cursor_type",
+      "//ui/display",
+      "//ui/gfx:native_widget_types",
+    ]
+    deps = [
+      "//skia",
+      "//ui/base",
+      "//ui/gfx",
+      "//ui/gfx:geometry_skia",
+      "//ui/gfx/geometry",
+      "//ui/resources:ui_resources_grd",
+    ]
+
+    if (is_win) {
+      sources += [
+        "cursor_loader_win.cc",
+        "cursor_loader_win.h",
+      ]
+      deps += [ "//ui/resources:ui_unscaled_resources_grd" ]
+    }
+
+    if (use_ozone) {
+      sources += [
+        "ozone/bitmap_cursor_factory_ozone.cc",
+        "ozone/bitmap_cursor_factory_ozone.h",
+      ]
+      public_deps += [
+        "//skia",
+        "//ui/gfx/geometry",
+      ]
+    }
+
+    if (use_x11 || use_ozone) {
+      sources += [
+        "cursor_loader_ozone.cc",
+        "cursor_loader_ozone.h",
+      ]
+    }
   }
+}
 
-  if (is_win) {
-    sources += [ "cursor_win.cc" ]
+source_set("unittests") {
+  testonly = true
+  sources = []
+  deps = [
+    "//skia",
+    "//testing/gtest",
+    "//ui/gfx/geometry",
+  ]
+
+  if (!is_ios) {
+    sources += [ "cursor_unittest.cc" ]
+    deps += [
+      ":cursor_base",
+      "//ui/base/cursor/mojom:cursor_type",
+      "//ui/gfx:geometry_skia",
+    ]
+  }
+
+  if (use_aura) {
+    sources += [ "cursor_util_unittest.cc" ]
+    deps += [ ":cursor" ]
   }
 }