rexy712-overlay/dev-util/electron-next/files/chromium-78-xlib-name-clash.patch

34 lines
1.5 KiB
Diff

diff -Naur a/gpu/ipc/common/context_result.mojom b/gpu/ipc/common/context_result.mojom
--- a/gpu/ipc/common/context_result.mojom 2019-11-05 10:30:49.832537315 -0800
+++ b/gpu/ipc/common/context_result.mojom 2019-11-05 10:35:50.845516305 -0800
@@ -6,7 +6,7 @@
// gpu::ContextResult
enum ContextResult {
- Success,
+ GPUMojSuccess,
TransientFailure,
FatalFailure,
SurfaceFailure
diff -Naur a/gpu/ipc/common/context_result_mojom_traits.h b/gpu/ipc/common/context_result_mojom_traits.h
--- a/gpu/ipc/common/context_result_mojom_traits.h 2019-11-05 10:30:57.564536775 -0800
+++ b/gpu/ipc/common/context_result_mojom_traits.h 2019-11-05 10:33:06.343527787 -0800
@@ -15,7 +15,7 @@
static gpu::mojom::ContextResult ToMojom(gpu::ContextResult context_result) {
switch (context_result) {
case gpu::ContextResult::kSuccess:
- return gpu::mojom::ContextResult::Success;
+ return gpu::mojom::ContextResult::GPUMojSuccess;
case gpu::ContextResult::kTransientFailure:
return gpu::mojom::ContextResult::TransientFailure;
case gpu::ContextResult::kFatalFailure:
@@ -30,7 +30,7 @@
static bool FromMojom(gpu::mojom::ContextResult input,
gpu::ContextResult* out) {
switch (input) {
- case gpu::mojom::ContextResult::Success:
+ case gpu::mojom::ContextResult::GPUMojSuccess:
*out = gpu::ContextResult::kSuccess;
return true;
case gpu::mojom::ContextResult::TransientFailure: