Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2109)

Unified Diff: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc

Issue 9223041: WebGL functions returning strings should not return null Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
index 46e74d7b17276ae59ba5039ab7101cd95e40bf43..1babbd94f0d90a5e69c32ea6edf6a07c4fcc7fab 100644
--- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
@@ -711,10 +711,10 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog(
GLint logLength = 0;
gl_->GetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
if (!logLength)
- return WebKit::WebString();
+ return WebKit::WebString("");
scoped_array<GLchar> log(new GLchar[logLength]);
if (!log.get())
- return WebKit::WebString();
+ return WebKit::WebString("");
GLsizei returnedLogLength = 0;
gl_->GetProgramInfoLog(
program, logLength, &returnedLogLength, log.get());
@@ -734,10 +734,10 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog(
GLint logLength = 0;
gl_->GetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
if (!logLength)
- return WebKit::WebString();
+ return WebKit::WebString("");
scoped_array<GLchar> log(new GLchar[logLength]);
if (!log.get())
- return WebKit::WebString();
+ return WebKit::WebString("");
GLsizei returnedLogLength = 0;
gl_->GetShaderInfoLog(
shader, logLength, &returnedLogLength, log.get());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698