Revert 193798 "Revert r192949 "Disable shader disk cache by defa..."

trunk/src/gpu/command_buffer/service/memory_program_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/memory_program_cache.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/sha1.h"
@@ skipping 124 matching lines @@
   glGetProgramiv(program, GL_LINK_STATUS, &success);
   if (success == GL_FALSE) {
     return PROGRAM_LOAD_FAILURE;
   }
   shader_a->set_attrib_map(value->attrib_map_0);
   shader_a->set_uniform_map(value->uniform_map_0);
   shader_b->set_attrib_map(value->attrib_map_1);
   shader_b->set_uniform_map(value->uniform_map_1);
 
   if (!shader_callback.is_null() &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableGpuShaderDiskCache)) {
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableGpuShaderDiskCache)) {
     GpuProgramProto* proto = GpuProgramProto::default_instance().New();
     proto->set_sha(sha, kHashLength);
     proto->set_format(value->format);
     proto->set_program(value->data.get(), value->length);
 
     FillShaderProto(proto->mutable_vertex_shader(), a_sha, shader_a);
     FillShaderProto(proto->mutable_fragment_shader(), b_sha, shader_b);
     RunShaderCallback(shader_callback, proto, sha_string);
   }
 
@@ skipping 48 matching lines @@
     const std::string* program = eviction_helper_.PeekKey();
     const StoreMap::iterator found = store_.find(*program);
     const ProgramCacheValue* evicting = found->second.get();
     curr_size_bytes_ -= evicting->length;
     Evict(*program, evicting->shader_0_hash, evicting->shader_1_hash);
     store_.erase(found);
     eviction_helper_.PopKey();
   }
 
   if (!shader_callback.is_null() &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableGpuShaderDiskCache)) {
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableGpuShaderDiskCache)) {
     GpuProgramProto* proto = GpuProgramProto::default_instance().New();
     proto->set_sha(sha, kHashLength);
     proto->set_format(format);
     proto->set_program(binary.get(), length);
 
     FillShaderProto(proto->mutable_vertex_shader(), a_sha, shader_a);
     FillShaderProto(proto->mutable_fragment_shader(), b_sha, shader_b);
     RunShaderCallback(shader_callback, proto, sha_string);
   }
 
@@ skipping 88 matching lines @@
       attrib_map_0(_attrib_map_0),
       uniform_map_0(_uniform_map_0),
       shader_1_hash(_shader_1_hash, kHashLength),
       attrib_map_1(_attrib_map_1),
       uniform_map_1(_uniform_map_1) {}
 
 MemoryProgramCache::ProgramCacheValue::~ProgramCacheValue() {}
 
 }  // namespace gles2
 }  // namespace gpu