Remove WGC3D::isContextLost references from cc

cc/output/program_binding.cc

 // Copyright 2011 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 "cc/output/program_binding.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/output/geometry_binding.h"
 #include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
@@ skipping 10 matching lines @@
       initialized_(false) {}
 
 ProgramBindingBase::~ProgramBindingBase() {
   // If you hit these asserts, you initialized but forgot to call Cleanup().
   DCHECK(!program_);
   DCHECK(!vertex_shader_id_);
   DCHECK(!fragment_shader_id_);
   DCHECK(!initialized_);
 }
 
-void ProgramBindingBase::Init(WebGraphicsContext3D* context,
+bool ProgramBindingBase::Init(WebGraphicsContext3D* context,
                               const std::string& vertex_shader,
                               const std::string& fragment_shader) {
   TRACE_EVENT0("cc", "ProgramBindingBase::init");
   vertex_shader_id_ = LoadShader(context, GL_VERTEX_SHADER, vertex_shader);
-  if (!vertex_shader_id_) {
-    if (!IsContextLost(context))
-      LOG(ERROR) << "Failed to create vertex shader";
-    return;
-  }
+  if (!vertex_shader_id_)
+    return false;
 
   fragment_shader_id_ =
       LoadShader(context, GL_FRAGMENT_SHADER, fragment_shader);
   if (!fragment_shader_id_) {
     GLC(context, context->deleteShader(vertex_shader_id_));
     vertex_shader_id_ = 0;
-    if (!IsContextLost(context))
-      LOG(ERROR) << "Failed to create fragment shader";
-    return;
+    return false;
   }
 
   program_ =
       CreateShaderProgram(context, vertex_shader_id_, fragment_shader_id_);
-  DCHECK(program_ || IsContextLost(context));
+  return !!program_;
 }
 
-void ProgramBindingBase::Link(WebGraphicsContext3D* context) {
+bool ProgramBindingBase::Link(WebGraphicsContext3D* context) {
   GLC(context, context->linkProgram(program_));
   CleanupShaders(context);
   if (!program_)
-    return;
+    return false;
 #ifndef NDEBUG
   int linked = 0;
   GLC(context, context->getProgramiv(program_, GL_LINK_STATUS, &linked));
   if (!linked) {
-    if (!IsContextLost(context))
-      LOG(ERROR) << "Failed to link shader program";
     GLC(context, context->deleteProgram(program_));
+    return false;
   }
 #endif
+  return true;
 }
 
 void ProgramBindingBase::Cleanup(WebGraphicsContext3D* context) {
+  if (!initialized_)
+    return;
+
   initialized_ = false;
   if (!program_)
     return;
 
   DCHECK(context);
   GLC(context, context->deleteProgram(program_));
   program_ = 0;
 
   CleanupShaders(context);
 }
@@ skipping 14 matching lines @@
     return 0;
   }
 #endif
   return shader;
 }
 
 unsigned ProgramBindingBase::CreateShaderProgram(WebGraphicsContext3D* context,
                                                  unsigned vertex_shader,
                                                  unsigned fragment_shader) {
   unsigned program_object = context->createProgram();
-  if (!program_object) {
-    if (!IsContextLost(context))
-      LOG(ERROR) << "Failed to create shader program";
+  if (!program_object)
     return 0;
-  }
 
   GLC(context, context->attachShader(program_object, vertex_shader));
   GLC(context, context->attachShader(program_object, fragment_shader));
 
   // Bind the common attrib locations.
   GLC(context,
       context->bindAttribLocation(program_object,
                                   GeometryBinding::PositionAttribLocation(),
                                   "a_position"));
   GLC(context,
@@ skipping 13 matching lines @@
   if (vertex_shader_id_) {
     GLC(context, context->deleteShader(vertex_shader_id_));
     vertex_shader_id_ = 0;
   }
   if (fragment_shader_id_) {
     GLC(context, context->deleteShader(fragment_shader_id_));
     fragment_shader_id_ = 0;
   }
 }
 
-bool ProgramBindingBase::IsContextLost(WebGraphicsContext3D* context) {
-  return (context->getGraphicsResetStatusARB() != GL_NO_ERROR);
-}
-
 }  // namespace cc