FIXUP: Legalize the bloody code

Correct a few mistakes and add missing cases of illegal narrowing.

Change-Id: Ia25f9243787890daafc4b118f29e23b8de947a56
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

4 files changed, 12 insertions, 12 deletions

diff --git a/chromium/content/browser/scheduler/browser_ui_thread_scheduler.cc b/chromium/content/browser/scheduler/browser_ui_thread_scheduler.cc
index 54cae8574a5..9c7bff152ff 100644
--- a/chromium/content/browser/scheduler/browser_ui_thread_scheduler.cc
+++ b/chromium/content/browser/scheduler/browser_ui_thread_scheduler.cc
@@ -55,7 +55,7 @@ BrowserUIThreadScheduler::BrowserUIThreadScheduler()
     : owned_sequence_manager_(
           base::sequence_manager::CreateUnboundSequenceManager(
               base::sequence_manager::SequenceManager::Settings{
-                  .message_loop_type = base::MessageLoop::TYPE_UI})),
+                  base::MessageLoop::TYPE_UI})),
       sequence_manager_(owned_sequence_manager_.get()),
       time_domain_(sequence_manager_->GetRealTimeDomain()) {
   InitialiseTaskQueues();
diff --git a/chromium/device/gamepad/nintendo_controller.cc b/chromium/device/gamepad/nintendo_controller.cc
index 14ed72bc6fe..8c5912a84d8 100644
--- a/chromium/device/gamepad/nintendo_controller.cc
+++ b/chromium/device/gamepad/nintendo_controller.cc
@@ -1560,15 +1560,15 @@ void NintendoController::RequestEnableUsbTimeout(bool enable) {
 }
 
 void NintendoController::RequestEnableImu(bool enable) {
-  SubCommand(kSubCommandEnableImu, enable ? 0x01 : 0x00);
+  SubCommand(kSubCommandEnableImu, {uint8_t(enable ? 0x01 : 0x00)});
 }
 
 void NintendoController::RequestEnableVibration(bool enable) {
-  SubCommand(kSubCommandEnableVibration, enable ? 0x01 : 0x00);
+  SubCommand(kSubCommandEnableVibration, {uint8_t(enable ? 0x01 : 0x00)});
 }
 
 void NintendoController::RequestSetPlayerLights(uint8_t light_pattern) {
-  SubCommand(kSubCommandSetPlayerLights, light_pattern);
+  SubCommand(kSubCommandSetPlayerLights, {light_pattern});
 }
 
 void NintendoController::RequestSetHomeLight(
@@ -1583,8 +1583,8 @@ void NintendoController::RequestSetHomeLight(
   DCHECK_LE(cycle_count, 0xf);
   if ((cycle_count > 0 && minicycle_count == 1) || minicycle_duration == 0)
     minicycle_count = 0;
-  std::vector<uint8_t> bytes = {(minicycle_count << 4) | minicycle_duration,
-                                (start_intensity << 4) | cycle_count};
+  std::vector<uint8_t> bytes = {uint8_t((minicycle_count << 4) | minicycle_duration),
+                                uint8_t((start_intensity << 4) | cycle_count)};
   bytes.insert(bytes.end(), minicycle_data.begin(), minicycle_data.end());
   SubCommand(kSubCommandSetHomeLight, bytes);
 }
@@ -1602,7 +1602,7 @@ void NintendoController::RequestSetHomeLightIntensity(double intensity) {
   // 1x minicycle duration. Because |minicycle_count| and |cycle_count| are
   // both zero, the device will transition to the 1st minicycle and then stay at
   // |led_intensity|.
-  RequestSetHomeLight(0, 1, led_intensity, 0, {led_intensity << 4, 0x00});
+  RequestSetHomeLight(0, 1, led_intensity, 0, {uint8_t(led_intensity << 4), 0x00});
 }
 
 void NintendoController::RequestSetImuSensitivity(
@@ -1625,7 +1625,7 @@ void NintendoController::ReadSpi(uint16_t address, size_t length) {
   uint8_t address_high = (address >> 8) & 0xff;
   uint8_t address_low = address & 0xff;
   SubCommand(kSubCommandReadSpi,
-             {address_low, address_high, 0x00, 0x00, uint8_t{length}});
+             {address_low, address_high, 0x00, 0x00, uint8_t(length)});
 }
 
 void NintendoController::RequestImuCalibration() {
diff --git a/chromium/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util.cc b/chromium/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util.cc
index c90050c9c0f..140524bb20e 100644
--- a/chromium/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util.cc
+++ b/chromium/third_party/blink/renderer/modules/mediastream/media_stream_constraints_util.cc
@@ -342,8 +342,8 @@ WebMediaStreamSource::Capabilities ComputeCapabilitiesForVideoSource(
       max_height = std::max(max_height, format.frame_size.height());
       max_frame_rate = std::max(max_frame_rate, format.frame_rate);
     }
-    capabilities.width = {1, max_width};
-    capabilities.height = {1, max_height};
+    capabilities.width = {1, unsigned(max_width)};
+    capabilities.height = {1, unsigned(max_height)};
     capabilities.aspect_ratio = {1.0 / max_height,
                                  static_cast<double>(max_width)};
     capabilities.frame_rate = {min_frame_rate, max_frame_rate};
diff --git a/chromium/third_party/blink/renderer/modules/xr/xr_ray.cc b/chromium/third_party/blink/renderer/modules/xr/xr_ray.cc
index 0be5ebc3632..6d55941f80f 100644
--- a/chromium/third_party/blink/renderer/modules/xr/xr_ray.cc
+++ b/chromium/third_party/blink/renderer/modules/xr/xr_ray.cc
@@ -107,8 +107,8 @@ DOMFloat32Array* XRRay::matrix() {
 
     const blink::FloatPoint3D initialRayDirection =
         blink::FloatPoint3D{0.f, 0.f, -1.f};
-    const blink::FloatPoint3D desiredRayDirection = {
-        direction_->x(), direction_->y(), direction_->z()};
+    const blink::FloatPoint3D desiredRayDirection(
+        direction_->x(), direction_->y(), direction_->z());
 
     float cos_angle = initialRayDirection.Dot(desiredRayDirection);