aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc')
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
index 18dfaad660c4..928d1511ba43 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2021-04-14 18:41:04 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2021-07-19 18:45:17 UTC
+++ gpu/ipc/service/gpu_watchdog_thread.cc
-@@ -73,7 +73,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t
+@@ -88,7 +88,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t
}
#endif
@@ -9,7 +9,7 @@
tty_file_ = base::OpenFile(
base::FilePath(FILE_PATH_LITERAL("/sys/class/tty/tty0/active")), "r");
UpdateActiveTTY();
-@@ -101,7 +101,7 @@ GpuWatchdogThread::~GpuWatchdogThread() {
+@@ -116,7 +116,7 @@ GpuWatchdogThread::~GpuWatchdogThread() {
CloseHandle(watched_thread_handle_);
#endif
@@ -18,7 +18,7 @@
if (tty_file_)
fclose(tty_file_);
#endif
-@@ -440,7 +440,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() {
+@@ -449,7 +449,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() {
if (foregrounded_event_)
num_of_timeout_after_foregrounded_++;
@@ -27,7 +27,7 @@
UpdateActiveTTY();
#endif
-@@ -773,7 +773,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded()
+@@ -782,7 +782,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded()
return foregrounded_event_ && num_of_timeout_after_foregrounded_ <= count;
}
@@ -36,7 +36,7 @@
void GpuWatchdogThread::UpdateActiveTTY() {
last_active_tty_ = active_tty_;
-@@ -790,7 +790,7 @@ void GpuWatchdogThread::UpdateActiveTTY() {
+@@ -799,7 +799,7 @@ void GpuWatchdogThread::UpdateActiveTTY() {
#endif
bool GpuWatchdogThread::ContinueOnNonHostX11ServerTty() {