diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 1 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
| -rw-r--r-- | chrome/renderer/render_thread.cc | 20 |
4 files changed, 0 insertions, 26 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index cbe2baa..114466a 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -722,7 +722,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( switches::kEnableRemoting, switches::kEnableClickToPlay, switches::kEnableResourceContentSettings, - switches::kPrelaunchGpuProcess, switches::kEnableAcceleratedDecoding, switches::kDisableFileSystem, switches::kPpapiOutOfProcess, diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 7f14050..a7d5534 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -932,10 +932,6 @@ const char kPpapiPluginProcess[] = "ppapi"; // Causes the PPAPI sub process to display a dialog on launch. const char kPpapiStartupDialog[] = "ppapi-startup-dialog"; -// Establishes a channel to the GPU process asynchronously and (re)launches it -// if necessary when a renderer process starts. -const char kPrelaunchGpuProcess[] = "prelaunch-gpu-process"; - // Prints the pages on the screen. const char kPrint[] = "print"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index a874a49..a9c013a 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -267,7 +267,6 @@ extern const char kPpapiOutOfProcess[]; extern const char kPpapiPluginLauncher[]; extern const char kPpapiPluginProcess[]; extern const char kPpapiStartupDialog[]; -extern const char kPrelaunchGpuProcess[]; extern const char kPrint[]; extern const char kProcessPerSite[]; extern const char kProcessPerTab[]; diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 8f06872..2d9c465 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -127,9 +127,6 @@ static const double kInitialIdleHandlerDelayS = 1.0 /* seconds */; static const double kInitialExtensionIdleHandlerDelayS = 5.0 /* seconds */; static const int64 kMaxExtensionIdleHandlerDelayS = 5*60 /* seconds */; -static const int kPrelauchGpuPercentage = 5; -static const int kPrelauchGpuProcessDelayMS = 10000; - // Keep the global RenderThread in a TLS slot so it is impossible to access // incorrectly from the wrong thread. static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls( @@ -301,23 +298,6 @@ void RenderThread::Init() { AddFilter(suicide_on_channel_error_filter_.get()); #endif - // Establish a channel to the GPU process asynchronously if requested. If the - // channel is established in time, EstablishGpuChannelSync will not block when - // it is later called. Delays by a fixed period of time to avoid loading the - // GPU immediately in an attempt to not slow startup time. - scoped_refptr<base::FieldTrial> prelaunch_trial( - new base::FieldTrial("PrelaunchGpuProcessExperiment", 100)); - int prelaunch_group = prelaunch_trial->AppendGroup("prelaunch_gpu_process", - kPrelauchGpuPercentage); - if (prelaunch_group == prelaunch_trial->group() || - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kPrelaunchGpuProcess)) { - message_loop()->PostDelayedTask(FROM_HERE, - task_factory_->NewRunnableMethod( - &RenderThread::EstablishGpuChannel), - kPrelauchGpuProcessDelayMS); - } - TRACE_EVENT_END("RenderThread::Init", 0, ""); } |