Commit ada42fcc authored by apatrick@chromium.org's avatar apatrick@chromium.org

Disabled GPU process prelaunch field trial.

This might be causing the GPU to hang even when not viewing GPU hardware accelerated content. An example appears to be the ATI HD2600 on mac.

TEST=try
BUG=none

Review URL: http://codereview.chromium.org/6380001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71737 0039d316-1c4b-4281-b951-d872f2087c98
parent cafd0b6f
...@@ -722,7 +722,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( ...@@ -722,7 +722,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
switches::kEnableRemoting, switches::kEnableRemoting,
switches::kEnableClickToPlay, switches::kEnableClickToPlay,
switches::kEnableResourceContentSettings, switches::kEnableResourceContentSettings,
switches::kPrelaunchGpuProcess,
switches::kEnableAcceleratedDecoding, switches::kEnableAcceleratedDecoding,
switches::kDisableFileSystem, switches::kDisableFileSystem,
switches::kPpapiOutOfProcess, switches::kPpapiOutOfProcess,
......
...@@ -932,10 +932,6 @@ const char kPpapiPluginProcess[] = "ppapi"; ...@@ -932,10 +932,6 @@ const char kPpapiPluginProcess[] = "ppapi";
// Causes the PPAPI sub process to display a dialog on launch. // Causes the PPAPI sub process to display a dialog on launch.
const char kPpapiStartupDialog[] = "ppapi-startup-dialog"; 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. // Prints the pages on the screen.
const char kPrint[] = "print"; const char kPrint[] = "print";
......
...@@ -267,7 +267,6 @@ extern const char kPpapiOutOfProcess[]; ...@@ -267,7 +267,6 @@ extern const char kPpapiOutOfProcess[];
extern const char kPpapiPluginLauncher[]; extern const char kPpapiPluginLauncher[];
extern const char kPpapiPluginProcess[]; extern const char kPpapiPluginProcess[];
extern const char kPpapiStartupDialog[]; extern const char kPpapiStartupDialog[];
extern const char kPrelaunchGpuProcess[];
extern const char kPrint[]; extern const char kPrint[];
extern const char kProcessPerSite[]; extern const char kProcessPerSite[];
extern const char kProcessPerTab[]; extern const char kProcessPerTab[];
......
...@@ -127,9 +127,6 @@ static const double kInitialIdleHandlerDelayS = 1.0 /* seconds */; ...@@ -127,9 +127,6 @@ static const double kInitialIdleHandlerDelayS = 1.0 /* seconds */;
static const double kInitialExtensionIdleHandlerDelayS = 5.0 /* seconds */; static const double kInitialExtensionIdleHandlerDelayS = 5.0 /* seconds */;
static const int64 kMaxExtensionIdleHandlerDelayS = 5*60 /* 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 // Keep the global RenderThread in a TLS slot so it is impossible to access
// incorrectly from the wrong thread. // incorrectly from the wrong thread.
static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls( static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls(
...@@ -301,23 +298,6 @@ void RenderThread::Init() { ...@@ -301,23 +298,6 @@ void RenderThread::Init() {
AddFilter(suicide_on_channel_error_filter_.get()); AddFilter(suicide_on_channel_error_filter_.get());
#endif #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, ""); TRACE_EVENT_END("RenderThread::Init", 0, "");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment