From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/components/metal_util/test_shader.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'chromium/components/metal_util/test_shader.h') diff --git a/chromium/components/metal_util/test_shader.h b/chromium/components/metal_util/test_shader.h index c892b5cd1d4..5e1d9863a97 100644 --- a/chromium/components/metal_util/test_shader.h +++ b/chromium/components/metal_util/test_shader.h @@ -31,15 +31,14 @@ enum class METAL_UTIL_EXPORT TestShaderResult { }; using TestShaderCallback = - base::OnceCallback; // A default timeout value for compiling the test shader. constexpr base::TimeDelta kTestShaderTimeout = base::TimeDelta::FromMinutes(1); -// Return the value kTestShaderTimeoutTime for |method_time| and |compile_time| -// if they time out. +// Return the value kTestShaderTimeoutTime for |compile_time| if it times out. constexpr base::TimeDelta kTestShaderTimeForever = base::TimeDelta::FromMinutes(3); @@ -49,7 +48,8 @@ constexpr base::TimeDelta kTestShaderDelay = base::TimeDelta::FromMinutes(3); // Attempt to asynchronously compile a trivial Metal shader. If |delay| is zero, // then compile synchronously, otherwise, post a delayed task to do the compile. // |callback| with the result when the shader succeeds or after |timeout| has -// elapsed. +// elapsed. Whether compile or link was tested is communicated to |callback| in +// its |component| argument. // // This is used to determine of the Metal shader compiler is resposive. Note // that |callback| will be called either on another thread or inside the @@ -58,8 +58,7 @@ constexpr base::TimeDelta kTestShaderDelay = base::TimeDelta::FromMinutes(3); void METAL_UTIL_EXPORT TestShader(TestShaderCallback callback, const base::TimeDelta& delay = kTestShaderDelay, - const base::TimeDelta& timeout = kTestShaderTimeout, - TestShaderComponent component = TestShaderComponent::kLink); + const base::TimeDelta& timeout = kTestShaderTimeForever); } // namespace metal -- cgit v1.2.1