Revert 67293 BrowserTestCanLaunchWithOSMesa was consistently failing - Initia...

media/tools/player_x11/gl_video_renderer.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.
 
 #include "media/tools/player_x11/gl_video_renderer.h"
 
 #include <X11/Xutil.h>
 
 #include "app/gfx/gl/gl_implementation.h"
 #include "media/base/buffers.h"
@@ skipping 151 matching lines @@
   // Create our YUV->RGB shader.
   GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER);
   const char* vs_source = kVertexShader;
   int vs_size = sizeof(kVertexShader);
   glShaderSource(vertex_shader, 1, &vs_source, &vs_size);
   glCompileShader(vertex_shader);
   int result = GL_FALSE;
   glGetShaderiv(vertex_shader, GL_COMPILE_STATUS, &result);
   if (!result) {
     char log[kErrorSize];
-    int len = 0;
+    int len;
     glGetShaderInfoLog(vertex_shader, kErrorSize - 1, &len, log);
     log[kErrorSize - 1] = 0;
     LOG(FATAL) << log;
   }
   glAttachShader(program, vertex_shader);
   glDeleteShader(vertex_shader);
 
   GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
   const char* ps_source = kFragmentShader;
   int ps_size = sizeof(kFragmentShader);
   glShaderSource(fragment_shader, 1, &ps_source, &ps_size);
   glCompileShader(fragment_shader);
   result = GL_FALSE;
   glGetShaderiv(fragment_shader, GL_COMPILE_STATUS, &result);
   if (!result) {
     char log[kErrorSize];
-    int len = 0;
+    int len;
     glGetShaderInfoLog(fragment_shader, kErrorSize - 1, &len, log);
     log[kErrorSize - 1] = 0;
     LOG(FATAL) << log;
   }
   glAttachShader(program, fragment_shader);
   glDeleteShader(fragment_shader);
 
   glLinkProgram(program);
   result = GL_FALSE;
   glGetProgramiv(program, GL_LINK_STATUS, &result);
   if (!result) {
     char log[kErrorSize];
-    int len = 0;
+    int len;
     glGetProgramInfoLog(program, kErrorSize - 1, &len, log);
     log[kErrorSize - 1] = 0;
     LOG(FATAL) << log;
   }
   glUseProgram(program);
   glDeleteProgram(program);
 
   // Bind parameters.
   glUniform1i(glGetUniformLocation(program, "y_tex"), 0);
   glUniform1i(glGetUniformLocation(program, "u_tex"), 1);
@@ skipping 57 matching lines @@
     glActiveTexture(GL_TEXTURE0 + i);
     glPixelStorei(GL_UNPACK_ROW_LENGTH, video_frame->stride(i));
     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, width, height, 0,
                  GL_LUMINANCE, GL_UNSIGNED_BYTE, video_frame->data(i));
   }
   PutCurrentFrame(video_frame);
 
   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
   glXSwapBuffers(display_, window_);
 }