diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-06 12:48:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:33:43 +0000 |
| commit | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch) | |
| tree | fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/gpu/ipc/common/gpu_info_mojom_traits.cc | |
| parent | 79b4f909db1049fca459c07cca55af56a9b54fe3 (diff) | |
| download | qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz | |
BASELINE: Update Chromium to 84.0.4147.141
Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
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.cc | 7 |
1 files changed, 6 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 264b9d57a70..3d7e314ba8c 100644 --- a/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc +++ b/chromium/gpu/ipc/common/gpu_info_mojom_traits.cc @@ -5,7 +5,7 @@ #include "gpu/ipc/common/gpu_info_mojom_traits.h" #include "build/build_config.h" -#include "base/logging.h" +#include "base/notreached.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #if BUILDFLAG(ENABLE_VULKAN) @@ -330,6 +330,8 @@ EnumTraits<gpu::mojom::OverlaySupport, gpu::OverlaySupport>::ToMojom( return gpu::mojom::OverlaySupport::DIRECT; case gpu::OverlaySupport::kScaling: return gpu::mojom::OverlaySupport::SCALING; + case gpu::OverlaySupport::kSoftware: + return gpu::mojom::OverlaySupport::SOFTWARE; } } @@ -346,6 +348,9 @@ bool EnumTraits<gpu::mojom::OverlaySupport, gpu::OverlaySupport>::FromMojom( case gpu::mojom::OverlaySupport::SCALING: *out = gpu::OverlaySupport::kScaling; break; + case gpu::mojom::OverlaySupport::SOFTWARE: + *out = gpu::OverlaySupport::kSoftware; + break; } return true; } |