Update from https://crrev.com/318214

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 115 matching lines @@
 
 void Shader::IncUseCount() {
   ++use_count_;
 }
 
 void Shader::DecUseCount() {
   --use_count_;
   DCHECK_GE(use_count_, 0);
 }
 
-void Shader::MarkAsDeleted() {
+void Shader::Delete() {
+  if (use_count_ > 0) {
+    // If attached, compile the shader before we delete it.
+    DoCompile();
+  }
   DCHECK_NE(service_id_, 0u);
+  glDeleteShader(service_id_);
   service_id_ = 0;
 }
 
 const sh::Attribute* Shader::GetAttribInfo(const std::string& name) const {
   // Vertex attributes can't be arrays or structs (GLSL ES 3.00.4, section
   // 4.3.4, "Input Variables"), so |name| is the top level name used as
   // the AttributeMap key.
   AttributeMap::const_iterator it = attrib_map_.find(name);
   return it != attrib_map_.end() ? &it->second : NULL;
 }
@@ skipping 30 matching lines @@
 
 ShaderManager::~ShaderManager() {
   DCHECK(shaders_.empty());
 }
 
 void ShaderManager::Destroy(bool have_context) {
   while (!shaders_.empty()) {
     if (have_context) {
       Shader* shader = shaders_.begin()->second.get();
       if (!shader->IsDeleted()) {
-        glDeleteShader(shader->service_id());
-        shader->MarkAsDeleted();
+        shader->Delete();
       }
     }
     shaders_.erase(shaders_.begin());
   }
 }
 
 Shader* ShaderManager::CreateShader(
     GLuint client_id,
     GLuint service_id,
     GLenum shader_type) {
@@ skipping 40 matching lines @@
          it != shaders_.end(); ++it) {
       if (it->second.get() == shader) {
         shaders_.erase(it);
         return;
       }
     }
     NOTREACHED();
   }
 }
 
-void ShaderManager::MarkAsDeleted(Shader* shader) {
+void ShaderManager::Delete(Shader* shader) {
   DCHECK(shader);
   DCHECK(IsOwned(shader));
-  shader->MarkAsDeleted();
+  shader->Delete();
   RemoveShader(shader);
 }
 
 void ShaderManager::UseShader(Shader* shader) {
   DCHECK(shader);
   DCHECK(IsOwned(shader));
   shader->IncUseCount();
 }
 
 void ShaderManager::UnuseShader(Shader* shader) {
   DCHECK(shader);
   DCHECK(IsOwned(shader));
   shader->DecUseCount();
   RemoveShader(shader);
 }
 
 }  // namespace gles2
 }  // namespace gpu
-
-