| Index: gpu/ipc/service/gpu_channel_manager.h
|
| diff --git a/gpu/ipc/service/gpu_channel_manager.h b/gpu/ipc/service/gpu_channel_manager.h
|
| index 01301b2708c77d94b158a654db3bcd5464ba9bf6..083df330758c059c4091b5944c0af5f12228389f 100644
|
| --- a/gpu/ipc/service/gpu_channel_manager.h
|
| +++ b/gpu/ipc/service/gpu_channel_manager.h
|
| @@ -17,6 +17,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "build/build_config.h"
|
| +#include "gpu/command_buffer/common/activity_flags.h"
|
| #include "gpu/command_buffer/common/constants.h"
|
| #include "gpu/command_buffer/service/gpu_preferences.h"
|
| #include "gpu/config/gpu_driver_bug_workarounds.h"
|
| @@ -72,7 +73,8 @@ class GPU_EXPORT GpuChannelManager {
|
| base::WaitableEvent* shutdown_event,
|
| SyncPointManager* sync_point_manager,
|
| GpuMemoryBufferFactory* gpu_memory_buffer_factory,
|
| - const GpuFeatureInfo& gpu_feature_info);
|
| + const GpuFeatureInfo& gpu_feature_info,
|
| + GpuProcessActivityFlags activity_flags);
|
| virtual ~GpuChannelManager();
|
|
|
| GpuChannelManagerDelegate* delegate() const { return delegate_; }
|
| @@ -204,6 +206,10 @@ class GPU_EXPORT GpuChannelManager {
|
| // Set during intentional GPU process shutdown.
|
| bool exiting_for_lost_context_;
|
|
|
| + // Flags which indicate GPU process activity. Read by the browser process
|
| + // on GPU process crash.
|
| + GpuProcessActivityFlags activity_flags_;
|
| +
|
| // Member variables should appear before the WeakPtrFactory, to ensure
|
| // that any WeakPtrs to Controller are invalidated before its members
|
| // variable's destructors are executed, rendering them invalid.
|
|
|