summaryrefslogtreecommitdiff
path: root/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-03-11 11:32:04 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-03-18 13:40:17 +0000
commit31ccca0778db85c159634478b4ec7997f6704860 (patch)
tree3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
parent248b70b82a40964d5594eb04feca0fa36716185d (diff)
downloadqtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/gpu/ipc/common/gpu_info_mojom_traits.cc')
-rw-r--r--chromium/gpu/ipc/common/gpu_info_mojom_traits.cc11
1 files changed, 10 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 f777a5195e6..248daaf61ce 100644
--- a/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
+++ b/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
@@ -8,6 +8,10 @@
#include "base/logging.h"
#include "mojo/public/cpp/base/time_mojom_traits.h"
+#if BUILDFLAG(ENABLE_VULKAN)
+#include "gpu/ipc/common/vulkan_info_mojom_traits.h"
+#endif
+
namespace mojo {
// static
@@ -379,6 +383,7 @@ bool StructTraits<gpu::mojom::GpuInfoDataView, gpu::GPUInfo>::Read(
out->rgba_visual = data.rgba_visual();
#endif
out->oop_rasterization_supported = data.oop_rasterization_supported();
+ out->subpixel_font_rendering = data.subpixel_font_rendering();
#if defined(OS_WIN)
out->direct_composition = data.direct_composition();
@@ -412,7 +417,11 @@ bool StructTraits<gpu::mojom::GpuInfoDataView, gpu::GPUInfo>::Read(
data.ReadVideoEncodeAcceleratorSupportedProfiles(
&out->video_encode_accelerator_supported_profiles) &&
data.ReadImageDecodeAcceleratorSupportedProfiles(
- &out->image_decode_accelerator_supported_profiles);
+ &out->image_decode_accelerator_supported_profiles) &&
+#if BUILDFLAG(ENABLE_VULKAN)
+ data.ReadVulkanInfo(&out->vulkan_info) &&
+#endif
+ true;
}
} // namespace mojo