[pull] main from chromium:main

DEPS

@@ -195,7 +195,7 @@ vars = {
   # By default, do not check out versions of toolschains and sdks that are
   # specifically only needed by Lacros.
   'checkout_lacros_sdk': False,
-  'lacros_sdk_version': '14385.0.0',
+  'lacros_sdk_version': '14395.0.0',
 
   # Generate location tag metadata to include in tests result data uploaded
   # to ResultDB. This isn't needed on some configs and the tool that generates
@@ -239,19 +239,19 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'ddbf93159f00315cbe32212fbc96decc0c3e0709',
+  'skia_revision': '33c28b9fa98634d36dbb5f404a3be33decc35463',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
   'v8_revision': '8a05d7add33e40e73aac9fc43b4d9cce04adeaca',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '1fc9b7c6e0e4be4e6ebdc1bd8ccca58fa0fdecfd',
+  'angle_revision': '42bd4fc29aea6c0c1722d3604b0eadf7fb1e9aca',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
-  'swiftshader_revision': '1eee6cbcf034ec237e6916612f86b83861459d5e',
+  'swiftshader_revision': 'f354daff5a2b882fc182c8377c826aa99b30f989',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFium
   # and whatever else without interference from each other.
@@ -314,7 +314,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': '7f5c3ecd65d7ca4f8a62c4d61fda43be64d0cc59',
+  'devtools_frontend_revision': 'ebad3a4739fd8170cf9b8b91496cf8b866972d0a',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -1033,7 +1033,7 @@ deps = {
 
   # For Linux and Chromium OS.
   'src/third_party/cros_system_api': {
-      'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '48bb7e7474f066964e314a2c2e110912ce99a05b',
+      'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '738cc02fc3beb133d085f871e2534416baf5afc7',
       'condition': 'checkout_linux',
   },
 
@@ -1404,7 +1404,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + 'b52786888ddce9d6bc06b7825ba9bffc65924e0c',
 
   'src/third_party/openscreen/src':
-    Var('chromium_git') + '/openscreen' + '@' + '040084e9d194e43a59831fb0192b63929182aef4',
+    Var('chromium_git') + '/openscreen' + '@' + '8620ec89411da06662dfd920ba4e45b999269a77',
 
   'src/third_party/openxr/src': {
     'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + 'bf21ccb1007bb531b45d9978919a56ea5059c245',
@@ -1639,7 +1639,7 @@ deps = {
     Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'b1f3776e4913637221733a4da09f3339e783b771',
 
   'src/third_party/webgpu-cts/src':
-    Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'aa6dcde554d68ea68684af3e6699541ff6067793',
+    Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '216e2ff413d3ed5e7695626bb55ae41575818352',
 
   'src/third_party/webrtc':
     Var('webrtc_git') + '/src.git' + '@' + '699d1a242ecd3ca819293cfa96f5dcf8f5e1b91a',
@@ -1700,7 +1700,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@28fd420279617c4b0b1d199a10ceb380ca60d08c',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@df7c46c625a3bb971a83b1469c8e82f7db00eeca',
     'condition': 'checkout_src_internal',
   },
 

ash/components/arc/mojom/BUILD.gn

@@ -163,10 +163,14 @@ mojom("mojom") {
           move_only = true
         },
       ]
-      traits_headers = [ "//ash/components/arc/mojom/ime_mojom_traits.h" ]
+
+      traits_headers = [ "ime_mojom_traits.h" ]
+      traits_sources = [ "ime_mojom_traits.cc" ]
       traits_public_deps = [
         "//ui/base/ime",
+        "//ui/base/ime:text_input_types",
         "//ui/events",
+        "//ui/events/ozone/layout",
       ]
     },
     {
@@ -399,19 +403,6 @@ mojom("protected_buffer_manager") {
   ]
 }
 
-source_set("mojom_traits") {
-  sources = [
-    "ime_mojom_traits.cc",
-    "ime_mojom_traits.h",
-  ]
-
-  deps = [
-    ":mojom",
-    "//ui/base/ime:text_input_types",
-    "//ui/events",
-    "//ui/events/ozone/layout",
-  ]
-}
 source_set("unit_tests") {
   testonly = true
   sources = [
@@ -421,7 +412,6 @@ source_set("unit_tests") {
 
   deps = [
     ":mojom",
-    ":mojom_traits",
     "//media",
     "//mojo/public/cpp/test_support:test_utils",
     "//testing/gtest",

ash/system/time/calendar_month_view.cc

@@ -109,6 +109,11 @@ void CalendarDateCellView::OnPaintBackground(gfx::Canvas* canvas) {
   const SkColor border_color = color_provider->GetControlsLayerColor(
       AshColorProvider::ControlsLayerType::kFocusRingColor);
 
+  const gfx::Rect content = GetContentsBounds();
+  const gfx::Point center(
+      (content.width() + calendar_utils::kDateHorizontalPadding * 2) / 2,
+      (content.height() + calendar_utils::kDateVerticalPadding * 2) / 2);
+
   // If the view is focused or selected, paint a solid background.
   is_selected_ = calendar_utils::IsTheSameDay(
       date_, calendar_view_controller_->selected_date());
@@ -119,11 +124,6 @@ void CalendarDateCellView::OnPaintBackground(gfx::Canvas* canvas) {
     SetEnabledTextColors(text_color);
 
     cc::PaintFlags background;
-    const gfx::Rect content = GetContentsBounds();
-    const gfx::Point center(
-        (content.width() + calendar_utils::kDateHorizontalPadding * 2) / 2,
-        (content.height() + calendar_utils::kDateVerticalPadding * 2) / 2);
-
     background.setColor(border_color);
     background.setStyle(cc::PaintFlags::kFill_Style);
     background.setAntiAlias(true);
@@ -139,11 +139,6 @@ void CalendarDateCellView::OnPaintBackground(gfx::Canvas* canvas) {
     return;
 
   cc::PaintFlags highlight_background;
-  const gfx::Rect content = GetContentsBounds();
-  gfx::Point center(
-      (content.width() + calendar_utils::kDateHorizontalPadding * 2) / 2,
-      (content.height() + calendar_utils::kDateVerticalPadding * 2) / 2);
-
   highlight_background.setColor(bg_color);
   highlight_background.setStyle(cc::PaintFlags::kFill_Style);
   highlight_background.setAntiAlias(true);