Clean up interfaces between Shader / ShaderTranslator / ANGLE side.

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 112 matching lines @@
 ProgramCache::ProgramLoadResult MemoryProgramCache::LoadLinkedProgram(
     GLuint program,
     Shader* shader_a,
     const ShaderTranslatorInterface* translator_a,
     Shader* shader_b,
     const ShaderTranslatorInterface* translator_b,
     const LocationMap* bind_attrib_location_map,
     const ShaderCacheCallback& shader_callback) {
   char a_sha[kHashLength];
   char b_sha[kHashLength];
-  DCHECK(shader_a && shader_a->signature_source() &&
-         shader_b && shader_b->signature_source());
+  DCHECK(shader_a && !shader_a->signature_source().empty() &&
+         shader_b && !shader_b->signature_source().empty());
   ComputeShaderHash(
-      *shader_a->signature_source(), translator_a, a_sha);
+      shader_a->signature_source(), translator_a, a_sha);
   ComputeShaderHash(
-      *shader_b->signature_source(), translator_b, b_sha);
+      shader_b->signature_source(), translator_b, b_sha);
 
   char sha[kHashLength];
   ComputeProgramHash(a_sha,
                      b_sha,
                      bind_attrib_location_map,
                      sha);
   const std::string sha_string(sha, kHashLength);
 
   ProgramMRUCache::iterator found = store_.Get(sha_string);
   if (found == store_.end()) {
@@ skipping 50 matching lines @@
   scoped_ptr<char[]> binary(new char[length]);
   glGetProgramBinary(program,
                      length,
                      NULL,
                      &format,
                      binary.get());
   UMA_HISTOGRAM_COUNTS("GPU.ProgramCache.ProgramBinarySizeBytes", length);
 
   char a_sha[kHashLength];
   char b_sha[kHashLength];
-  DCHECK(shader_a && shader_a->signature_source() &&
-         shader_b && shader_b->signature_source());
+  DCHECK(shader_a && !shader_a->signature_source().empty() &&
+         shader_b && !shader_b->signature_source().empty());
   ComputeShaderHash(
-      *shader_a->signature_source(), translator_a, a_sha);
+      shader_a->signature_source(), translator_a, a_sha);
   ComputeShaderHash(
-      *shader_b->signature_source(), translator_b, b_sha);
+      shader_b->signature_source(), translator_b, b_sha);
 
   char sha[kHashLength];
   ComputeProgramHash(a_sha,
                      b_sha,
                      bind_attrib_location_map,
                      sha);
   const std::string sha_string(sha, sizeof(sha));
 
   UMA_HISTOGRAM_COUNTS("GPU.ProgramCache.MemorySizeBeforeKb",
                        curr_size_bytes_ / 1024);
@@ skipping 136 matching lines @@
   program_cache_->LinkedProgramCacheSuccess(program_hash);
 }
 
 MemoryProgramCache::ProgramCacheValue::~ProgramCacheValue() {
   program_cache_->curr_size_bytes_ -= length_;
   program_cache_->Evict(program_hash_);
 }
 
 }  // namespace gles2
 }  // namespace gpu