chore: cherry-pick d652130c4bc2 from chromium (#37171)

* chore: cherry-pick d652130c4bc2 from chromium

* chore: update patches

---------

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: electron-patch-conflict-fixer[bot] <83340002+electron-patch-conflict-fixer[bot]@users.noreply.github.com>
This commit is contained in:
Keeley Hammond
2023-02-08 06:26:58 -08:00
committed by GitHub
parent 99b0c77cd7
commit bafcd316b2
2 changed files with 32 additions and 0 deletions

View File

@@ -160,4 +160,5 @@ cherry-pick-819d876e1bb8.patch
cherry-pick-43637378b14e.patch
win_fix_touch_mode_detection_dcheck_in_canary.patch
cherry-pick-ca2b108a0f1f.patch
cherry-pick-d652130c4bc2.patch
cherry-pick-e545559df538.patch

View File

@@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Vasiliy Telezhnikov <vasilyt@chromium.org>
Date: Mon, 16 Jan 2023 17:43:34 +0000
Subject: Remove NUM_COMMAND_BUFFER_NAMESPACES from SyncToken.mojom
Mojo validates input for allowed values, NUM_COMMAND_BUFFER_NAMESPACES
is not valid value to send over ipc and is used only to know maximum
value in code.
Bug: 1406115
Change-Id: I8e5c3b6b2a9a9206fbeb377b27ceb1242a4f54e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4167409
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1093100}
diff --git a/gpu/ipc/common/sync_token.mojom b/gpu/ipc/common/sync_token.mojom
index 7c957007e3a377bd1e9969f14d9edc80c7d76645..b24017647aa6a11080580dd48e4c3d1cd79d1cf3 100644
--- a/gpu/ipc/common/sync_token.mojom
+++ b/gpu/ipc/common/sync_token.mojom
@@ -11,9 +11,7 @@ enum CommandBufferNamespace {
GPU_IO,
IN_PROCESS,
MOJO,
- MOJO_LOCAL,
-
- NUM_COMMAND_BUFFER_NAMESPACES
+ MOJO_LOCAL
};
// See gpu/command_buffer/common/sync_token.h