Remove getError() and synthesizeGLError() from WebGraphicsContext3D.

third_party/WebKit/Source/modules/webgl/WebGLProgram.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 55 matching lines @@
     if (m_vertexShader) {
         m_vertexShader->onDetached(context3d, gl);
         m_vertexShader = nullptr;
     }
     if (m_fragmentShader) {
         m_fragmentShader->onDetached(context3d, gl);
         m_fragmentShader = nullptr;
     }
 }
 
-unsigned WebGLProgram::numActiveAttribLocations()
+bool WebGLProgram::linkStatus(WebGLRenderingContextBase* context)
 {
-    cacheInfoIfNeeded();
-    return m_activeAttribLocations.size();
-}
-
-GLint WebGLProgram::getActiveAttribLocation(GLuint index)
-{
-    cacheInfoIfNeeded();
-    if (index >= numActiveAttribLocations())
-        return -1;
-    return m_activeAttribLocations[index];
-}
-
-bool WebGLProgram::isUsingVertexAttrib0()
-{
-    cacheInfoIfNeeded();
-    for (unsigned ii = 0; ii < numActiveAttribLocations(); ++ii) {
-        if (!getActiveAttribLocation(ii))
-            return true;
-    }
-    return false;
-}
-
-bool WebGLProgram::linkStatus()
-{
-    cacheInfoIfNeeded();
+    cacheInfoIfNeeded(context);
     return m_linkStatus;
 }
 
 void WebGLProgram::increaseLinkCount()
 {
     ++m_linkCount;
     m_infoValid = false;
 }
 
 void WebGLProgram::increaseActiveTransformFeedbackCount()
@@ skipping 51 matching lines @@
     case GL_FRAGMENT_SHADER:
         if (m_fragmentShader != shader)
             return false;
         m_fragmentShader = nullptr;
         return true;
     default:
         return false;
     }
 }
 
-void WebGLProgram::cacheActiveAttribLocations(WebGraphicsContext3D* context3d, gpu::gles2::GLES2Interface* gl)
-{
-    m_activeAttribLocations.clear();
-
-    GLint numAttribs = 0;
-    gl->GetProgramiv(m_object, GL_ACTIVE_ATTRIBUTES, &numAttribs);
-    m_activeAttribLocations.resize(static_cast<size_t>(numAttribs));
-    for (int i = 0; i < numAttribs; ++i) {
-        WebGraphicsContext3D::ActiveInfo info;
-        context3d->getActiveAttrib(m_object, i, info);
-        m_activeAttribLocations[i] = gl->GetAttribLocation(m_object, info.name.utf8().data());
-    }
-}
-
-void WebGLProgram::cacheInfoIfNeeded()
+void WebGLProgram::cacheInfoIfNeeded(WebGLRenderingContextBase* context)
 {
     if (m_infoValid)
         return;
-
     if (!m_object)
         return;
-
-    if (!contextGroup())
-        return;
-    WebGraphicsContext3D* context = contextGroup()->getAWebGraphicsContext3D();
-    if (!context)
-        return;
-    gpu::gles2::GLES2Interface* gl = context->getGLES2Interface();
-    GLint linkStatus = 0;
-    gl->GetProgramiv(m_object, GL_LINK_STATUS, &linkStatus);
-    m_linkStatus = linkStatus;
-    if (m_linkStatus)
-        cacheActiveAttribLocations(context, gl);
+    gpu::gles2::GLES2Interface* gl = context->contextGL();
+    m_linkStatus = 0;
+    gl->GetProgramiv(m_object, GL_LINK_STATUS, &m_linkStatus);
     m_infoValid = true;
 }
 
 DEFINE_TRACE(WebGLProgram)
 {
     visitor->trace(m_vertexShader);
     visitor->trace(m_fragmentShader);
     WebGLSharedPlatform3DObject::trace(visitor);
 }
 
 } // namespace blink