summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-26 16:47:04 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-26 16:47:04 +0000
commit4ce9301d7ca308263a9e7c569f50129f37aba634 (patch)
treed225b7dda0a77d7dede9b6601279349f9b07b1b6 /content
parent41abb6d9f69fd6e3da44b555107252d709f32105 (diff)
downloadchromium_src-4ce9301d7ca308263a9e7c569f50129f37aba634.zip
chromium_src-4ce9301d7ca308263a9e7c569f50129f37aba634.tar.gz
chromium_src-4ce9301d7ca308263a9e7c569f50129f37aba634.tar.bz2
Revert 195083 "Revert "Revert 193798 "Revert r192949 "Disable sh..."
Still causing automation proxy failures in memory_test on linux perf bots. BUG=230085 > Revert "Revert 193798 "Revert r192949 "Disable shader disk cache by defa..."" > > The automation_proxy don't appear in the build run where this was committed. > Doesn't seem like this is the root cause of the issues. > > > Revert 193798 "Revert r192949 "Disable shader disk cache by defa..." > > > > Reverting seems to fix memory_test test locally on linux. > > > > BUG=230085 > > > > > Revert r192949 "Disable shader disk cache by default." > > > > > > This reverts commit r192949. The disable has been merged into > > > M27 so re-enabling on trunk. > > > > > > BUG=228989 > > > > > > Review URL: https://chromiumcodereview.appspot.com/13872012 > > > > TBR=dsinclair@chromium.org > > > > Review URL: https://codereview.chromium.org/13924005 > > TBR=tonyg@chromium.org > > Review URL: https://chromiumcodereview.appspot.com/14119009 TBR=dsinclair@chromium.org Review URL: https://codereview.chromium.org/14518008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/gpu/gpu_process_host.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index e52ce61..f3f380a3 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -716,8 +716,8 @@ void GpuProcessHost::EstablishGpuChannel(
callback.Run(IPC::ChannelHandle(), GPUInfo());
}
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableGpuShaderDiskCache)) {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableGpuShaderDiskCache)) {
CreateChannelCache(client_id, gpu::kDefaultMaxProgramCacheMemoryBytes);
}
}