Revert 67293 BrowserTestCanLaunchWithOSMesa was consistently failing - Initia...

chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc

 // Copyright (c) 2010 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.
 
 #if defined(ENABLE_GPU)
 
 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
@@ skipping 675 matching lines @@
 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog(
     WebGLId program) {
   makeContextCurrent();
   GLint logLength = 0;
   glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
   if (!logLength)
     return WebKit::WebString();
   scoped_array<GLchar> log(new GLchar[logLength]);
   if (!log.get())
     return WebKit::WebString();
-  GLsizei returnedLogLength = 0;
+  GLsizei returnedLogLength;
   glGetProgramInfoLog(program, logLength, &returnedLogLength, log.get());
   DCHECK_EQ(logLength, returnedLogLength + 1);
   WebKit::WebString res =
       WebKit::WebString::fromUTF8(log.get(), returnedLogLength);
   return res;
 }
 
 DELEGATE_TO_GL_3(getRenderbufferParameteriv, GetRenderbufferParameteriv,
                  unsigned long, unsigned long, int*)
 
 DELEGATE_TO_GL_3(getShaderiv, GetShaderiv, WebGLId, unsigned long, int*)
 
 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog(
     WebGLId shader) {
   makeContextCurrent();
   GLint logLength = 0;
   glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
   if (!logLength)
     return WebKit::WebString();
   scoped_array<GLchar> log(new GLchar[logLength]);
   if (!log.get())
     return WebKit::WebString();
-  GLsizei returnedLogLength = 0;
+  GLsizei returnedLogLength;
   glGetShaderInfoLog(shader, logLength, &returnedLogLength, log.get());
   DCHECK_EQ(logLength, returnedLogLength + 1);
   WebKit::WebString res =
       WebKit::WebString::fromUTF8(log.get(), returnedLogLength);
   return res;
 }
 
 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderSource(
     WebGLId shader) {
   makeContextCurrent();
   GLint logLength = 0;
   glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &logLength);
   if (!logLength)
     return WebKit::WebString();
   scoped_array<GLchar> log(new GLchar[logLength]);
   if (!log.get())
     return WebKit::WebString();
-  GLsizei returnedLogLength = 0;
+  GLsizei returnedLogLength;
   glGetShaderSource(shader, logLength, &returnedLogLength, log.get());
   DCHECK_EQ(logLength, returnedLogLength + 1);
   WebKit::WebString res =
       WebKit::WebString::fromUTF8(log.get(), returnedLogLength);
   return res;
 }
 
 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getString(
     unsigned long name) {
   makeContextCurrent();
@@ skipping 259 matching lines @@
 }
 
 void WebGraphicsContext3DCommandBufferImpl::copyTextureToCompositor(
     unsigned texture, unsigned parentTexture) {
   makeContextCurrent();
   glCopyTextureToParentTextureCHROMIUM(texture, parentTexture);
   glFlush();
 }
 
 #endif  // defined(ENABLE_GPU)