Fix upstream merge issues in 2d.composite.grid.* WPT tests
When https://crrev.com/c/5889473 was merged upstream to WPT, the
operation failed and required manual intervention. The incorrect
patchset got merged, which resulted in the changes from the latest
patchsets to be later reverted by the WPT Autoroller
(https://crrev.com/c/5950284). This CL fixes this merge issue.
Bug: 364549423
Change-Id: I87cc16b1615f9874e38a4616bfe1f5d084381e6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5972984
Reviewed-by: Jonathan Lee jonathanjlee@google.com
Commit-Queue: Jean-Philippe Gravel jpgravel@chromium.org
Cr-Commit-Position: refs/heads/main@{#1375510}