Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

gpu/command_buffer/service/shader_manager.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/shader_manager.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 63 matching lines @@
     source_for_driver = translated_source_.c_str();
   }
 
   glShaderSource(service_id_, 1, &source_for_driver, NULL);
   glCompileShader(service_id_);
   if (source_type_ == kANGLE) {
     GLint max_len = 0;
     glGetShaderiv(service_id_,
                   GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE,
                   &max_len);
-    source_for_driver = "\0";
     translated_source_.resize(max_len);
-    if (max_len) {
-      GLint len = 0;
-      glGetTranslatedShaderSourceANGLE(
-          service_id_, translated_source_.size(),
-          &len, &translated_source_.at(0));
-      DCHECK(max_len == 0 || len < max_len);
-      DCHECK(len == 0 || translated_source_[len] == '\0');
-      translated_source_.resize(len);
-      source_for_driver = translated_source_.c_str();
-    }
+    GLint len = 0;
+    glGetTranslatedShaderSourceANGLE(
+        service_id_, translated_source_.size(),
+        &len, &translated_source_.at(0));
+    DCHECK(max_len == 0 || len < max_len);
+    DCHECK(len == 0 || translated_source_[len] == '\0');
+    translated_source_.resize(len);
+    source_for_driver = translated_source_.c_str();
   }
 
   GLint status = GL_FALSE;
   glGetShaderiv(service_id_, GL_COMPILE_STATUS, &status);
   if (status == GL_TRUE) {
     valid_ = true;
   } else {
-    valid_ = false;
-
     // We cannot reach here if we are using the shader translator.
     // All invalid shaders must be rejected by the translator.
     // All translated shaders must compile.
     GLint max_len = 0;
     glGetShaderiv(service_id_, GL_INFO_LOG_LENGTH, &max_len);
     log_info_.resize(max_len);
-    if (max_len) {
-      GLint len = 0;
-      glGetShaderInfoLog(service_id_, log_info_.size(), &len, &log_info_.at(0));
-      DCHECK(max_len == 0 || len < max_len);
-      DCHECK(len == 0 || log_info_[len] == '\0');
-      log_info_.resize(len);
-    }
+    GLint len = 0;
+    glGetShaderInfoLog(service_id_, log_info_.size(), &len, &log_info_.at(0));
+    DCHECK(max_len == 0 || len < max_len);
+    DCHECK(len == 0 || log_info_[len] == '\0');
+    valid_ = false;
+    log_info_.resize(len);
     LOG_IF(ERROR, translator)
         << "Shader translator allowed/produced an invalid shader "
         << "unless the driver is buggy:"
         << "\n--original-shader--\n" << last_compiled_source_
         << "\n--translated-shader--\n" << source_for_driver
         << "\n--info-log--\n" << log_info_;
   }
 }
 
 void Shader::IncUseCount() {
@@ skipping 136 matching lines @@
   DCHECK(shader);
   DCHECK(IsOwned(shader));
   shader->DecUseCount();
   RemoveShader(shader);
 }
 
 }  // namespace gles2
 }  // namespace gpu