content/gpu/gpu_watchdog_thread.h - Issue 836473003: Avoid gpu watchdog crash on timeout if X is un-responsive.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/gpu/gpu_watchdog_thread.h

Issue 836473003: Avoid gpu watchdog crash on timeout if X is un-responsive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: content/gpu/gpu_watchdog_thread.h

diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h

index c766ca3493796949c6f8365c5f879630a8de38e0..2259c31b58fa14305d917c0eb975b7955c69945d 100644

--- a/content/gpu/gpu_watchdog_thread.h

+++ b/content/gpu/gpu_watchdog_thread.h

@@ -62,6 +62,9 @@ class GpuWatchdogThread : public base::Thread,

void OnAcknowledge();

void OnCheck(bool after_suspend);

void DeliberatelyTerminateToRecoverFromHang();

+#if defined(USE_X11)

+ void CheckXServerActive();

+#endif

void OnAddPowerObserver();

@@ -93,6 +96,10 @@ class GpuWatchdogThread : public base::Thread,

FILE* tty_file_;

#endif

+#if defined(USE_X11)

+ bool x_server_active;

danakj 2015/01/06 00:29:19 member variables have _ suffix

+#endif

base::WeakPtrFactory<GpuWatchdogThread> weak_factory_;

DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread);

« no previous file with comments | « no previous file | content/gpu/gpu_watchdog_thread.cc » ('j') | content/gpu/gpu_watchdog_thread.cc » ('J')