From d78d971064ef0c1b4418a3fecf9c20fed2a84411 Mon Sep 17 00:00:00 2001
From: Maggie Chen <magchen@chromium.org>
Date: Fri, 30 Aug 2019 17:36:53 +0000
Subject: [PATCH] Fix the GPU watchdog restart on Linux
After the GPU watchdog starts in the GPU initialization, the watchdog
thread is stopped before sandbox initialization and then restarted after
the sandbox. This CL fixes the bug that causes the watchdog restart failure.
Because of this bug, the GPU watchdog did not run on Linux. This CL will
enable the GPU watchdog on Linux again.
Bug: 992572
Change-Id: I9dc1da1ef23bda772f2d47d9f4a733b624dce517
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1772516
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Maggie Chen <magchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692113}
---
gpu/ipc/service/gpu_watchdog_thread.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/gpu/ipc/service/gpu_watchdog_thread.cc b/gpu/ipc/service/gpu_watchdog_thread.cc
index 376bb1753c36d..2b9268decf196 100644
--- a/gpu/ipc/service/gpu_watchdog_thread.cc
+++ b/gpu/ipc/service/gpu_watchdog_thread.cc
@@ -146,6 +146,7 @@ void GpuWatchdogThreadImplV1::Init() {
void GpuWatchdogThreadImplV1::CleanUp() {
weak_factory_.InvalidateWeakPtrs();
+ armed_ = false;
}
GpuWatchdogThreadImplV1::GpuWatchdogTaskObserver::GpuWatchdogTaskObserver(