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-10-29 10:46:47 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-02 12:02:10 +0000
commit99677208ff3b216fdfec551fbe548da5520cd6fb (patch)
tree476a4865c10320249360e859d8fdd3e01833b03a /chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
parentc30a6232df03e1efbd9f3b226777b07e087a1122 (diff)
downloadqtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc b/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
index 1d967041854..37d479bf744 100644
--- a/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
+++ b/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc
@@ -382,13 +382,13 @@ bool StructTraits<gpu::mojom::GpuInfoDataView, gpu::GPUInfo>::Read(
out->passthrough_cmd_decoder = data.passthrough_cmd_decoder();
out->can_support_threaded_texture_mailbox =
data.can_support_threaded_texture_mailbox();
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
if (!gpu::ValidateMacOSSpecificTextureTarget(
data.macos_specific_texture_target())) {
return false;
}
out->macos_specific_texture_target = data.macos_specific_texture_target();
-#endif // OS_MACOSX
+#endif // OS_MAC
out->jpeg_decode_accelerator_supported =
data.jpeg_decode_accelerator_supported();