Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5036)

Unified Diff: chrome/gpu/gpu_watchdog_thread.h

Issue 5301007: Fixed null dereference in GPU watchdog termination code.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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
« no previous file with comments | « chrome/gpu/gpu_thread.cc ('k') | chrome/gpu/gpu_watchdog_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/gpu/gpu_watchdog_thread.h
===================================================================
--- chrome/gpu/gpu_watchdog_thread.h (revision 67749)
+++ chrome/gpu/gpu_watchdog_thread.h (working copy)
@@ -16,7 +16,7 @@
class GpuWatchdogThread : public base::Thread,
public base::RefCountedThreadSafe<GpuWatchdogThread> {
public:
- GpuWatchdogThread(MessageLoop* watched_message_loop, int timeout);
+ explicit GpuWatchdogThread(int timeout);
virtual ~GpuWatchdogThread();
// Accessible on watched thread but only modified by watchdog thread.
@@ -50,11 +50,18 @@
void OnExit();
void Disable();
+ int64 GetWatchedThreadTime();
+
MessageLoop* watched_message_loop_;
int timeout_;
volatile bool armed_;
GpuWatchdogTaskObserver task_observer_;
+#if defined(OS_WIN)
+ void* watched_thread_handle_;
+ int64 arm_time_;
+#endif
+
typedef ScopedRunnableMethodFactory<GpuWatchdogThread> MethodFactory;
scoped_ptr<MethodFactory> method_factory_;
« no previous file with comments | « chrome/gpu/gpu_thread.cc ('k') | chrome/gpu/gpu_watchdog_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698