aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h')
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
index efcc11f3008d..c711d7bec6e5 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-07-07 21:58:16 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-11-13 06:36:44 UTC
+++ gpu/ipc/service/gpu_watchdog_thread.h
-@@ -216,7 +216,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
+@@ -213,7 +213,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
base::ThreadTicks GetWatchedThreadTime();
#endif
@@ -9,9 +9,9 @@
void UpdateActiveTTY();
#endif
-@@ -274,7 +274,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
- // whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded.
- bool is_watchdog_start_histogram_recorded = false;
+@@ -261,7 +261,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
+ base::Time check_time_;
+ base::TimeTicks check_timeticks_;
-#if defined(USE_X11)
+#if defined(USE_X11) && !defined(OS_BSD)