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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #if defined(ENABLE_GPU) 5 #if defined(ENABLE_GPU)
6 6
7 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" 7 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
8 8
9 #include "gpu/GLES2/gl2.h" 9 #include "gpu/GLES2/gl2.h"
10 #ifndef GL_GLEXT_PROTOTYPES 10 #ifndef GL_GLEXT_PROTOTYPES
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 704
705 DELEGATE_TO_GL_2(getIntegerv, GetIntegerv, WGC3Denum, WGC3Dint*) 705 DELEGATE_TO_GL_2(getIntegerv, GetIntegerv, WGC3Denum, WGC3Dint*)
706 706
707 DELEGATE_TO_GL_3(getProgramiv, GetProgramiv, WebGLId, WGC3Denum, WGC3Dint*) 707 DELEGATE_TO_GL_3(getProgramiv, GetProgramiv, WebGLId, WGC3Denum, WGC3Dint*)
708 708
709 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog( 709 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog(
710 WebGLId program) { 710 WebGLId program) {
711 GLint logLength = 0; 711 GLint logLength = 0;
712 gl_->GetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength); 712 gl_->GetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
713 if (!logLength) 713 if (!logLength)
714 return WebKit::WebString(); 714 return WebKit::WebString("");
715 scoped_array<GLchar> log(new GLchar[logLength]); 715 scoped_array<GLchar> log(new GLchar[logLength]);
716 if (!log.get()) 716 if (!log.get())
717 return WebKit::WebString(); 717 return WebKit::WebString("");
718 GLsizei returnedLogLength = 0; 718 GLsizei returnedLogLength = 0;
719 gl_->GetProgramInfoLog( 719 gl_->GetProgramInfoLog(
720 program, logLength, &returnedLogLength, log.get()); 720 program, logLength, &returnedLogLength, log.get());
721 DCHECK_EQ(logLength, returnedLogLength + 1); 721 DCHECK_EQ(logLength, returnedLogLength + 1);
722 WebKit::WebString res = 722 WebKit::WebString res =
723 WebKit::WebString::fromUTF8(log.get(), returnedLogLength); 723 WebKit::WebString::fromUTF8(log.get(), returnedLogLength);
724 return res; 724 return res;
725 } 725 }
726 726
727 DELEGATE_TO_GL_3(getRenderbufferParameteriv, GetRenderbufferParameteriv, 727 DELEGATE_TO_GL_3(getRenderbufferParameteriv, GetRenderbufferParameteriv,
728 WGC3Denum, WGC3Denum, WGC3Dint*) 728 WGC3Denum, WGC3Denum, WGC3Dint*)
729 729
730 DELEGATE_TO_GL_3(getShaderiv, GetShaderiv, WebGLId, WGC3Denum, WGC3Dint*) 730 DELEGATE_TO_GL_3(getShaderiv, GetShaderiv, WebGLId, WGC3Denum, WGC3Dint*)
731 731
732 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog( 732 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog(
733 WebGLId shader) { 733 WebGLId shader) {
734 GLint logLength = 0; 734 GLint logLength = 0;
735 gl_->GetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength); 735 gl_->GetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
736 if (!logLength) 736 if (!logLength)
737 return WebKit::WebString(); 737 return WebKit::WebString("");
738 scoped_array<GLchar> log(new GLchar[logLength]); 738 scoped_array<GLchar> log(new GLchar[logLength]);
739 if (!log.get()) 739 if (!log.get())
740 return WebKit::WebString(); 740 return WebKit::WebString("");
741 GLsizei returnedLogLength = 0; 741 GLsizei returnedLogLength = 0;
742 gl_->GetShaderInfoLog( 742 gl_->GetShaderInfoLog(
743 shader, logLength, &returnedLogLength, log.get()); 743 shader, logLength, &returnedLogLength, log.get());
744 DCHECK_EQ(logLength, returnedLogLength + 1); 744 DCHECK_EQ(logLength, returnedLogLength + 1);
745 WebKit::WebString res = 745 WebKit::WebString res =
746 WebKit::WebString::fromUTF8(log.get(), returnedLogLength); 746 WebKit::WebString::fromUTF8(log.get(), returnedLogLength);
747 return res; 747 return res;
748 } 748 }
749 749
750 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderSource( 750 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderSource(
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 } 1090 }
1091 #ifndef WTF_USE_THREADED_COMPOSITING 1091 #ifndef WTF_USE_THREADED_COMPOSITING
1092 RenderView* renderview = 1092 RenderView* renderview =
1093 web_view_ ? RenderView::FromWebView(web_view_) : NULL; 1093 web_view_ ? RenderView::FromWebView(web_view_) : NULL;
1094 if (renderview) 1094 if (renderview)
1095 renderview->OnViewContextSwapBuffersAborted(); 1095 renderview->OnViewContextSwapBuffersAborted();
1096 #endif 1096 #endif
1097 } 1097 }
1098 1098
1099 #endif // defined(ENABLE_GPU) 1099 #endif // defined(ENABLE_GPU)
OLDNEW
« 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