Skip to content

Commit

Permalink
Upstream fix for browser tests hanging on Windows CI.
Browse files Browse the repository at this point in the history
This applies upstream patch that fixes
https://bugs.chromium.org/p/chromium/issues/detail?id=1198567

Issue 1198567: Headless browser freezes on Windows unless launched with '--disable-gpu'

The fix is
https://chromium-review.googlesource.com/c/chromium/src/+/2872065 and
has not been merged into M91 yet.

https://chromium.googlesource.com/chromium/src/+/641d54d756baff01484214b16b00b4935a8be657%5E%21/#F0

commit	641d54d756baff01484214b16b00b4935a8be657
author	Alexis Hetu <[email protected]>

Revert using SwANGLE with kOverrideUseSoftwareGLForTests

kOverrideUseSoftwareGLForTests is unfortunately not only used for tests
and ends up being used for headless mode in the released version of
Chrome. To avoid issues, we'll remove it for now, merge in beta and
revert this CL afterwards, in order to give us enough time to write a
proper fix for this.

Bug: chromium:1060139
  • Loading branch information
mkarolin committed May 5, 2021
1 parent d65a024 commit c2cad6e
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions patches/ui-gl-gl_implementation.cc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc
index b12af225f1dde84c25791d0f4badb0fcb9541add..5acbd036bd8ff8ea34c39fea79507b3199f3ffad 100644
--- a/ui/gl/gl_implementation.cc
+++ b/ui/gl/gl_implementation.cc
@@ -182,11 +182,7 @@ GLImplementationParts GetSoftwareGLImplementation() {
}

GLImplementationParts GetSoftwareGLForTestsImplementation() {
-#if defined(OS_WIN)
- return GetSoftwareGLImplementation();
-#else
return GetLegacySoftwareGLImplementation();
-#endif
}

bool IsSoftwareGLImplementation(GLImplementationParts implementation) {

0 comments on commit c2cad6e

Please sign in to comment.