Move simple methods [F-S] from WebGraphicsContext3D to GLES2Interface.

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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/webgl/WebGLProgram.h"
 
+#include "gpu/command_buffer/client/gles2_interface.h"
 #include "modules/webgl/WebGLContextGroup.h"
 #include "modules/webgl/WebGLRenderingContextBase.h"
 
 namespace blink {
 
 WebGLProgram* WebGLProgram::create(WebGLRenderingContextBase* ctx)
 {
     return new WebGLProgram(ctx);
 }
 
@@ skipping 125 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)
+void WebGLProgram::cacheActiveAttribLocations(WebGraphicsContext3D* context3d, gpu::gles2::GLES2Interface* gl)
 {
     m_activeAttribLocations.clear();
 
     GLint numAttribs = 0;
-    context3d->getProgramiv(m_object, GL_ACTIVE_ATTRIBUTES, &numAttribs);
+    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] = context3d->getAttribLocation(m_object, info.name.utf8().data());
+        m_activeAttribLocations[i] = gl->GetAttribLocation(m_object, info.name.utf8().data());
     }
 }
 
 void WebGLProgram::cacheInfoIfNeeded()
 {
     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;
-    context->getProgramiv(m_object, GL_LINK_STATUS, &linkStatus);
+    gl->GetProgramiv(m_object, GL_LINK_STATUS, &linkStatus);
     m_linkStatus = linkStatus;
     if (m_linkStatus)
-        cacheActiveAttribLocations(context);
+        cacheActiveAttribLocations(context, gl);
     m_infoValid = true;
 }
 
 DEFINE_TRACE(WebGLProgram)
 {
     visitor->trace(m_vertexShader);
     visitor->trace(m_fragmentShader);
     WebGLSharedPlatform3DObject::trace(visitor);
 }
 
 } // namespace blink