| Index: gpu/config/gpu_switches.cc
|
| diff --git a/gpu/config/gpu_switches.cc b/gpu/config/gpu_switches.cc
|
| index 6b7cee7cd1ab1802a72ed1be3b2589171d3da24d..ea35c0070fdf5199311d8fca78c3f715d3f6e7a9 100644
|
| --- a/gpu/config/gpu_switches.cc
|
| +++ b/gpu/config/gpu_switches.cc
|
| @@ -6,8 +6,9 @@
|
|
|
| namespace switches {
|
|
|
| -// Pass a set of GpuDriverBugWorkaroundType ids, seperated by ','.
|
| -const char kGpuDriverBugWorkarounds[] = "gpu-driver-bug-workarounds";
|
| +// Disable the thread that crashes the GPU process if it stops responding to
|
| +// messages.
|
| +const char kDisableGpuWatchdog[] = "disable-gpu-watchdog";
|
|
|
| // Passes active gpu vendor id from browser process to GPU process.
|
| const char kGpuActiveVendorID[] = "gpu-active-vendor-id";
|
| @@ -15,12 +16,30 @@ const char kGpuActiveVendorID[] = "gpu-active-vendor-id";
|
| // Passes active gpu device id from browser process to GPU process.
|
| const char kGpuActiveDeviceID[] = "gpu-active-device-id";
|
|
|
| +// Passes gpu device_id from browser process to GPU process.
|
| +const char kGpuDeviceID[] = "gpu-device-id";
|
| +
|
| +// Pass a set of GpuDriverBugWorkaroundType ids, seperated by ','.
|
| +const char kGpuDriverBugWorkarounds[] = "gpu-driver-bug-workarounds";
|
| +
|
| +// Passes gpu driver_vendor from browser process to GPU process.
|
| +const char kGpuDriverVendor[] = "gpu-driver-vendor";
|
| +
|
| +// Passes gpu driver_version from browser process to GPU process.
|
| +const char kGpuDriverVersion[] = "gpu-driver-version";
|
| +
|
| +// Passes gpu driver_date from browser process to GPU process.
|
| +const char kGpuDriverDate[] = "gpu-driver-date";
|
| +
|
| // Passes secondary gpu vendor ids from browser process to GPU process.
|
| const char kGpuSecondaryVendorIDs[] = "gpu-secondary-vendor-ids";
|
|
|
| // Passes secondary gpu device ids from browser process to GPU process.
|
| const char kGpuSecondaryDeviceIDs[] = "gpu-secondary-device-ids";
|
|
|
| +// Causes the GPU process to display a dialog on launch.
|
| +const char kGpuStartupDialog[] = "gpu-startup-dialog";
|
| +
|
| // Testing switch to not launch the gpu process for full gpu info collection.
|
| const char kGpuTestingNoCompleteInfoCollection[] =
|
| "gpu-no-complete-info-collection";
|
| @@ -52,4 +71,7 @@ const char kGpuTestingGLRenderer[] = "gpu-testing-gl-renderer";
|
| // Override gl version from the GpuInfoCollector.
|
| const char kGpuTestingGLVersion[] = "gpu-testing-gl-version";
|
|
|
| +// Passes gpu vendor_id from browser process to GPU process.
|
| +const char kGpuVendorID[] = "gpu-vendor-id";
|
| +
|
| } // namespace switches
|
|
|