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

Side by Side Diff: Source/core/html/canvas/WebGLRenderingContextBase.h

Issue 386953002: Make WebGLRenderingContext.getAttachedShaders() return type nullable (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix additional test expectations Created 6 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 void enableVertexAttribArray(GLuint index); 179 void enableVertexAttribArray(GLuint index);
180 void finish(); 180 void finish();
181 void flush(); 181 void flush();
182 void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum render buffertarget, WebGLRenderbuffer*); 182 void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum render buffertarget, WebGLRenderbuffer*);
183 void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget , WebGLTexture*, GLint level); 183 void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget , WebGLTexture*, GLint level);
184 void frontFace(GLenum mode); 184 void frontFace(GLenum mode);
185 void generateMipmap(GLenum target); 185 void generateMipmap(GLenum target);
186 186
187 PassRefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GLuint index); 187 PassRefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GLuint index);
188 PassRefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GLuint index); 188 PassRefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GLuint index);
189 bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader> >&); 189 Nullable<Vector<RefPtr<WebGLShader> > > getAttachedShaders(WebGLProgram*);
190 GLint getAttribLocation(WebGLProgram*, const String& name); 190 GLint getAttribLocation(WebGLProgram*, const String& name);
191 WebGLGetInfo getBufferParameter(GLenum target, GLenum pname); 191 WebGLGetInfo getBufferParameter(GLenum target, GLenum pname);
192 PassRefPtr<WebGLContextAttributes> getContextAttributes(); 192 PassRefPtr<WebGLContextAttributes> getContextAttributes();
193 GLenum getError(); 193 GLenum getError();
194 PassRefPtr<WebGLExtension> getExtension(const String& name); 194 PassRefPtr<WebGLExtension> getExtension(const String& name);
195 WebGLGetInfo getFramebufferAttachmentParameter(GLenum target, GLenum attachm ent, GLenum pname); 195 WebGLGetInfo getFramebufferAttachmentParameter(GLenum target, GLenum attachm ent, GLenum pname);
196 WebGLGetInfo getParameter(GLenum pname); 196 WebGLGetInfo getParameter(GLenum pname);
197 WebGLGetInfo getProgramParameter(WebGLProgram*, GLenum pname); 197 WebGLGetInfo getProgramParameter(WebGLProgram*, GLenum pname);
198 String getProgramInfoLog(WebGLProgram*); 198 String getProgramInfoLog(WebGLProgram*);
199 WebGLGetInfo getRenderbufferParameter(GLenum target, GLenum pname); 199 WebGLGetInfo getRenderbufferParameter(GLenum target, GLenum pname);
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 // If the vector is empty, return the maximum allowed active context number. 903 // If the vector is empty, return the maximum allowed active context number.
904 static size_t oldestContextIndex(); 904 static size_t oldestContextIndex();
905 static IntSize oldestContextSize(); 905 static IntSize oldestContextSize();
906 }; 906 };
907 907
908 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d()); 908 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d());
909 909
910 } // namespace WebCore 910 } // namespace WebCore
911 911
912 #endif // WebGLRenderingContextBase_h 912 #endif // WebGLRenderingContextBase_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698