BASELINE: Update Chromium to 104.0.5112.120

Change-Id: I5d2726c2ab018d75d055739b6ba64317904f05bb
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438935
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 45 insertions, 1 deletions

diff --git a/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc b/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
index 4cf025912e5..7925348ec7d 100644
--- a/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
+++ b/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
@@ -34,7 +34,8 @@ bool StructTraits<gpu::mojom::GpuDeviceDataView, gpu::GPUInfo::GPUDevice>::Read(
          data.ReadLuid(&out->luid) &&
 #endif  // BUILDFLAG(IS_WIN)
          data.ReadDriverVendor(&out->driver_vendor) &&
-         data.ReadDriverVersion(&out->driver_version);
+         data.ReadDriverVersion(&out->driver_version) &&
+         data.ReadGpuPreference(&out->gpu_preference);
 }
 
 // static
@@ -83,6 +84,23 @@ EnumTraits<gpu::mojom::VideoCodecProfile, gpu::VideoCodecProfile>::ToMojom(
       return gpu::mojom::VideoCodecProfile::HEVCPROFILE_MAIN10;
     case gpu::VideoCodecProfile::HEVCPROFILE_MAIN_STILL_PICTURE:
       return gpu::mojom::VideoCodecProfile::HEVCPROFILE_MAIN_STILL_PICTURE;
+    case gpu::VideoCodecProfile::HEVCPROFILE_REXT:
+      return gpu::mojom::VideoCodecProfile::HEVCPROFILE_REXT;
+    case gpu::VideoCodecProfile::HEVCPROFILE_HIGH_THROUGHPUT:
+      return gpu::mojom::VideoCodecProfile::HEVCPROFILE_HIGH_THROUGHPUT;
+    case gpu::VideoCodecProfile::HEVCPROFILE_MULTIVIEW_MAIN:
+      return gpu::mojom::VideoCodecProfile::HEVCPROFILE_MULTIVIEW_MAIN;
+    case gpu::VideoCodecProfile::HEVCPROFILE_SCALABLE_MAIN:
+      return gpu::mojom::VideoCodecProfile::HEVCPROFILE_SCALABLE_MAIN;
+    case gpu::VideoCodecProfile::HEVCPROFILE_3D_MAIN:
+      return gpu::mojom::VideoCodecProfile::HEVCPROFILE_3D_MAIN;
+    case gpu::VideoCodecProfile::HEVCPROFILE_SCREEN_EXTENDED:
+      return gpu::mojom::VideoCodecProfile::HEVCPROFILE_SCREEN_EXTENDED;
+    case gpu::VideoCodecProfile::HEVCPROFILE_SCALABLE_REXT:
+      return gpu::mojom::VideoCodecProfile::HEVCPROFILE_SCALABLE_REXT;
+    case gpu::VideoCodecProfile::HEVCPROFILE_HIGH_THROUGHPUT_SCREEN_EXTENDED:
+      return gpu::mojom::VideoCodecProfile::
+          HEVCPROFILE_HIGH_THROUGHPUT_SCREEN_EXTENDED;
     case gpu::VideoCodecProfile::DOLBYVISION_PROFILE0:
       return gpu::mojom::VideoCodecProfile::DOLBYVISION_PROFILE0;
     case gpu::VideoCodecProfile::DOLBYVISION_PROFILE4:
@@ -173,6 +191,32 @@ bool EnumTraits<gpu::mojom::VideoCodecProfile, gpu::VideoCodecProfile>::
     case gpu::mojom::VideoCodecProfile::HEVCPROFILE_MAIN_STILL_PICTURE:
       *out = gpu::VideoCodecProfile::HEVCPROFILE_MAIN_STILL_PICTURE;
       return true;
+    case gpu::mojom::VideoCodecProfile::HEVCPROFILE_REXT:
+      *out = gpu::VideoCodecProfile::HEVCPROFILE_REXT;
+      return true;
+    case gpu::mojom::VideoCodecProfile::HEVCPROFILE_HIGH_THROUGHPUT:
+      *out = gpu::VideoCodecProfile::HEVCPROFILE_HIGH_THROUGHPUT;
+      return true;
+    case gpu::mojom::VideoCodecProfile::HEVCPROFILE_MULTIVIEW_MAIN:
+      *out = gpu::VideoCodecProfile::HEVCPROFILE_MULTIVIEW_MAIN;
+      return true;
+    case gpu::mojom::VideoCodecProfile::HEVCPROFILE_SCALABLE_MAIN:
+      *out = gpu::VideoCodecProfile::HEVCPROFILE_SCALABLE_MAIN;
+      return true;
+    case gpu::mojom::VideoCodecProfile::HEVCPROFILE_3D_MAIN:
+      *out = gpu::VideoCodecProfile::HEVCPROFILE_3D_MAIN;
+      return true;
+    case gpu::mojom::VideoCodecProfile::HEVCPROFILE_SCREEN_EXTENDED:
+      *out = gpu::VideoCodecProfile::HEVCPROFILE_SCREEN_EXTENDED;
+      return true;
+    case gpu::mojom::VideoCodecProfile::HEVCPROFILE_SCALABLE_REXT:
+      *out = gpu::VideoCodecProfile::HEVCPROFILE_SCALABLE_REXT;
+      return true;
+    case gpu::mojom::VideoCodecProfile::
+        HEVCPROFILE_HIGH_THROUGHPUT_SCREEN_EXTENDED:
+      *out =
+          gpu::VideoCodecProfile::HEVCPROFILE_HIGH_THROUGHPUT_SCREEN_EXTENDED;
+      return true;
     case gpu::mojom::VideoCodecProfile::DOLBYVISION_PROFILE0:
       *out = gpu::VideoCodecProfile::DOLBYVISION_PROFILE0;
       return true;