diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-09 01:08:18 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-09 01:08:18 +0000 |
| commit | 3a95d11692d594cedaa312ee420189b13621038f (patch) | |
| tree | 0e3f848fa56f0c0871749867d3cda2c52aeac9d8 /content/renderer | |
| parent | bba32084c5b9914310b8f74359512f5729f179a9 (diff) | |
| download | chromium_src-3a95d11692d594cedaa312ee420189b13621038f.zip chromium_src-3a95d11692d594cedaa312ee420189b13621038f.tar.gz chromium_src-3a95d11692d594cedaa312ee420189b13621038f.tar.bz2 | |
Fix surface destruction, broken by r90096
Also, initialize parameter passed to GetShaderiv/GetProgramiv that trigger asserts in debug.
BUG=chromium-os:17082
TEST=youtube with pepper flash, go fullscreen and back.
Review URL: http://codereview.chromium.org/7328012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_widget_fullscreen_pepper.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index b9d3e21..04f9c1c 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -390,7 +390,7 @@ GLuint CreateShaderFromSource(gpu::gles2::GLES2Implementation* gl, GLuint shader = gl->CreateShader(type); gl->ShaderSource(shader, 1, &source, NULL); gl->CompileShader(shader); - int status; + int status = GL_FALSE; gl->GetShaderiv(shader, GL_COMPILE_STATUS, &status); if (!status) { int size = 0; @@ -432,7 +432,7 @@ bool RenderWidgetFullscreenPepper::InitContext() { gl->BindAttribLocation(program_, 0, "in_tex_coord"); gl->LinkProgram(program_); - int status; + int status = GL_FALSE; gl->GetProgramiv(program_, GL_LINK_STATUS, &status); if (!status) { int size = 0; |