| Index: content/browser/gpu/gpu_process_host.cc
|
| diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
|
| index fdf434b6a17d236280986a6742875768d7871ace..82d01a52b861ed3d15fcc80504356bd9a6f6b35c 100644
|
| --- a/content/browser/gpu/gpu_process_host.cc
|
| +++ b/content/browser/gpu/gpu_process_host.cc
|
| @@ -108,58 +108,59 @@ namespace {
|
|
|
| // Command-line switches to propagate to the GPU process.
|
| static const char* const kSwitchNames[] = {
|
| - switches::kDisableAcceleratedVideoDecode,
|
| - switches::kDisableBreakpad,
|
| - switches::kDisableGpuSandbox,
|
| - switches::kDisableGpuWatchdog,
|
| - switches::kDisableGLExtensions,
|
| - switches::kDisableLogging,
|
| - switches::kDisableSeccompFilterSandbox,
|
| + switches::kDisableAcceleratedVideoDecode,
|
| + switches::kDisableBreakpad,
|
| + switches::kDisableGpuSandbox,
|
| + switches::kDisableGpuWatchdog,
|
| + switches::kDisableGLExtensions,
|
| + switches::kDisableLogging,
|
| + switches::kDisableSeccompFilterSandbox,
|
| #if defined(ENABLE_WEBRTC)
|
| - switches::kDisableWebRtcHWEncoding,
|
| + switches::kDisableWebRtcHWEncoding,
|
| #endif
|
| #if defined(OS_WIN)
|
| - switches::kEnableAcceleratedVpxDecode,
|
| - switches::kEnableMFH264Encoding,
|
| + switches::kEnableAcceleratedVpxDecode,
|
| + switches::kEnableMFH264Encoding,
|
| #endif
|
| - switches::kEnableHeapProfiling,
|
| - switches::kEnableLogging,
|
| + switches::kEnableHeapProfiling,
|
| + switches::kEnableLogging,
|
| #if defined(OS_CHROMEOS)
|
| - switches::kDisableVaapiAcceleratedVideoEncode,
|
| + switches::kDisableVaapiAcceleratedVideoEncode,
|
| #endif
|
| - switches::kGpuDriverBugWorkarounds,
|
| - switches::kGpuStartupDialog,
|
| - switches::kGpuSandboxAllowSysVShm,
|
| - switches::kGpuSandboxFailuresFatal,
|
| - switches::kGpuSandboxStartEarly,
|
| - switches::kLoggingLevel,
|
| - switches::kEnableLowEndDeviceMode,
|
| - switches::kDisableLowEndDeviceMode,
|
| - switches::kEnableMemoryBenchmarking,
|
| - switches::kNoSandbox,
|
| - switches::kProfilerTiming,
|
| - switches::kTestGLLib,
|
| - switches::kTraceConfigFile,
|
| - switches::kTraceStartup,
|
| - switches::kTraceToConsole,
|
| - switches::kV,
|
| - switches::kVModule,
|
| + switches::kGpuDriverBugWorkarounds,
|
| + switches::kGpuStartupDialog,
|
| + switches::kGpuSandboxAllowSysVShm,
|
| + switches::kGpuSandboxFailuresFatal,
|
| + switches::kGpuSandboxStartEarly,
|
| + switches::kLoggingLevel,
|
| + switches::kEnableLowEndDeviceMode,
|
| + switches::kDisableLowEndDeviceMode,
|
| + switches::kEnableMemoryBenchmarking,
|
| + switches::kNoSandbox,
|
| + switches::kProfilerTiming,
|
| + switches::kTestGLLib,
|
| + switches::kTraceConfigFile,
|
| + switches::kTraceStartup,
|
| + switches::kTraceToConsole,
|
| + switches::kUseGpuInTests,
|
| + switches::kV,
|
| + switches::kVModule,
|
| #if defined(OS_MACOSX)
|
| - switches::kDisableRemoteCoreAnimation,
|
| - switches::kEnableSandboxLogging,
|
| - switches::kShowMacOverlayBorders,
|
| + switches::kDisableRemoteCoreAnimation,
|
| + switches::kEnableSandboxLogging,
|
| + switches::kShowMacOverlayBorders,
|
| #endif
|
| #if defined(USE_OZONE)
|
| - switches::kOzonePlatform,
|
| + switches::kOzonePlatform,
|
| #endif
|
| #if defined(USE_X11) && !defined(OS_CHROMEOS)
|
| - switches::kWindowDepth,
|
| - switches::kX11Display,
|
| - switches::kX11VisualID,
|
| + switches::kWindowDepth,
|
| + switches::kX11Display,
|
| + switches::kX11VisualID,
|
| #endif
|
| - switches::kGpuTestingGLVendor,
|
| - switches::kGpuTestingGLRenderer,
|
| - switches::kGpuTestingGLVersion,
|
| + switches::kGpuTestingGLVendor,
|
| + switches::kGpuTestingGLRenderer,
|
| + switches::kGpuTestingGLVersion,
|
| };
|
|
|
| enum GPUProcessLifetimeEvent {
|
|
|