Type conversion fixes, ui/ edition.

ui/gl/gl_bindings_skia_in_process.cc

 // Copyright (c) 2012 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 "ui/gl/gl_bindings_skia_in_process.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 449 matching lines @@
 }
 
 GLvoid StubGLTexSubImage2D(GLenum target, GLint level, GLint xoffset,
                            GLint yoffset, GLsizei width, GLsizei height,
                            GLenum format, GLenum type, const void* pixels) {
   glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type,
                   pixels);
 }
 
 GLvoid StubGLUniform1f(GLint location, GLfloat v) {
-  glUniform1i(location, v);
+  glUniform1f(location, v);
 }
 
 GLvoid StubGLUniform1i(GLint location, GLint v) {
   glUniform1i(location, v);
 }
 
 GLvoid StubGLUniform1fv(GLint location, GLsizei count, const GLfloat* v) {
   glUniform1fv(location, count, v);
 }
 
 GLvoid StubGLUniform1iv(GLint location, GLsizei count, const GLint* v) {
   glUniform1iv(location, count, v);
 }
 
 GLvoid StubGLUniform2f(GLint location, GLfloat v0, GLfloat v1) {
-  glUniform2i(location, v0, v1);
+  glUniform2f(location, v0, v1);
 }
 
 GLvoid StubGLUniform2i(GLint location, GLint v0, GLint v1) {
   glUniform2i(location, v0, v1);
 }
 
 GLvoid StubGLUniform2fv(GLint location, GLsizei count, const GLfloat* v) {
   glUniform2fv(location, count, v);
 }
 
 GLvoid StubGLUniform2iv(GLint location, GLsizei count, const GLint* v) {
   glUniform2iv(location, count, v);
 }
 
 GLvoid StubGLUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) {
-  glUniform3i(location, v0, v1, v2);
+  glUniform3f(location, v0, v1, v2);
 }
 
 GLvoid StubGLUniform3i(GLint location, GLint v0, GLint v1, GLint v2) {
   glUniform3i(location, v0, v1, v2);
 }
 
 GLvoid StubGLUniform3fv(GLint location, GLsizei count, const GLfloat* v) {
   glUniform3fv(location, count, v);
 }
 
 GLvoid StubGLUniform3iv(GLint location, GLsizei count, const GLint* v) {
   glUniform3iv(location, count, v);
 }
 
 GLvoid StubGLUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
                        GLfloat v3) {
-  glUniform4i(location, v0, v1, v2, v3);
+  glUniform4f(location, v0, v1, v2, v3);
 }
 
 GLvoid StubGLUniform4i(GLint location, GLint v0, GLint v1, GLint v2,
                        GLint v3) {
   glUniform4i(location, v0, v1, v2, v3);
 }
 
 GLvoid StubGLUniform4fv(GLint location, GLsizei count, const GLfloat* v) {
   glUniform4fv(location, count, v);
 }
@@ skipping 201 matching lines @@
   functions->fBlitFramebuffer = StubGLBlitFramebuffer;
   functions->fMapBuffer = StubGLMapBuffer;
   functions->fUnmapBuffer = StubGLUnmapBuffer;
   functions->fBindFragDataLocationIndexed =
     StubGLBindFragDataLocationIndexed;
 
   return interface;
 }
 
 }  // namespace gfx