diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-05 12:16:10 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-05 12:16:10 +0000 |
| commit | 228f013f8ac0eaac0f6522be8b8b5ea1f7ca522a (patch) | |
| tree | d2dd72fe36bcc387cb323e4f3e5950ff9e858cea | |
| parent | d4698f43fbfb1fd82032ba38dc0288ecd053f146 (diff) | |
| download | chromium_src-228f013f8ac0eaac0f6522be8b8b5ea1f7ca522a.zip chromium_src-228f013f8ac0eaac0f6522be8b8b5ea1f7ca522a.tar.gz chromium_src-228f013f8ac0eaac0f6522be8b8b5ea1f7ca522a.tar.bz2 | |
Fix Win64 build breakage from r261748
R=penghuang@chromium.org, yzshen@chromium.org
TBR=penghuang@chromium.org, yzshen@chromium.org
NOTRY=true
NOTREECHECKS=true
Review URL: https://codereview.chromium.org/227063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262001 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ppapi/examples/media_stream_video/media_stream_video.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/examples/media_stream_video/media_stream_video.cc b/ppapi/examples/media_stream_video/media_stream_video.cc index 727077b..71e6641 100644 --- a/ppapi/examples/media_stream_video/media_stream_video.cc +++ b/ppapi/examples/media_stream_video/media_stream_video.cc @@ -381,7 +381,7 @@ void MediaStreamVideoDemoInstance::CreateGLObjects() { void MediaStreamVideoDemoInstance::CreateShader( GLuint program, GLenum type, const char* source) { GLuint shader = glCreateShader(type); - GLint length = strlen(source) + 1; + GLint length = static_cast<GLint>(strlen(source) + 1); glShaderSource(shader, 1, &source, &length); glCompileShader(shader); glAttachShader(program, shader); |