Source/WebCore/html/canvas/WebGLRenderingContext.h - Issue 8043033: Merge 95728 - Ref protect shaders in V8WebGLRenderingContext::getAttachedShadersCallback

Side by Side Diff: Source/WebCore/html/canvas/WebGLRenderingContext.h

Issue 8043033: Merge 95728 - Ref protect shaders in V8WebGLRenderingContext::getAttachedShadersCallback (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 2 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

« no previous file with comments | « Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp ('k') | Source/WebCore/html/canvas/WebGLRenderingContext.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 125 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136 void enableVertexAttribArray(GC3Duint index, ExceptionCode&);	136 void enableVertexAttribArray(GC3Duint index, ExceptionCode&);

137 void finish();	137 void finish();

138 void flush();	138 void flush();

139 void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer*, ExceptionCode&);	139 void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer*, ExceptionCode&);

140 void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum tex target, WebGLTexture*, GC3Dint level, ExceptionCode&);	140 void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum tex target, WebGLTexture*, GC3Dint level, ExceptionCode&);

141 void frontFace(GC3Denum mode);	141 void frontFace(GC3Denum mode);

142 void generateMipmap(GC3Denum target);	142 void generateMipmap(GC3Denum target);

143	143

144 PassRefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index, E xceptionCode&);	144 PassRefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index, E xceptionCode&);

145 PassRefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index, ExceptionCode&);	145 PassRefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index, ExceptionCode&);

146 bool getAttachedShaders(WebGLProgram, Vector<WebGLShader>&, ExceptionCode& );	146 bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader> >&, Except ionCode&);

147 GC3Dint getAttribLocation(WebGLProgram*, const String& name);	147 GC3Dint getAttribLocation(WebGLProgram*, const String& name);

148 WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCo de&);	148 WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCo de&);

149 PassRefPtr<WebGLContextAttributes> getContextAttributes();	149 PassRefPtr<WebGLContextAttributes> getContextAttributes();

150 GC3Denum getError();	150 GC3Denum getError();

151 WebGLExtension* getExtension(const String& name);	151 WebGLExtension* getExtension(const String& name);

152 WebGLGetInfo getFramebufferAttachmentParameter(GC3Denum target, GC3Denum att achment, GC3Denum pname, ExceptionCode&);	152 WebGLGetInfo getFramebufferAttachmentParameter(GC3Denum target, GC3Denum att achment, GC3Denum pname, ExceptionCode&);

153 WebGLGetInfo getParameter(GC3Denum pname, ExceptionCode&);	153 WebGLGetInfo getParameter(GC3Denum pname, ExceptionCode&);

154 WebGLGetInfo getProgramParameter(WebGLProgram*, GC3Denum pname, ExceptionCod e&);	154 WebGLGetInfo getProgramParameter(WebGLProgram*, GC3Denum pname, ExceptionCod e&);

155 String getProgramInfoLog(WebGLProgram*, ExceptionCode&);	155 String getProgramInfoLog(WebGLProgram*, ExceptionCode&);

156 WebGLGetInfo getRenderbufferParameter(GC3Denum target, GC3Denum pname, Excep tionCode&);	156 WebGLGetInfo getRenderbufferParameter(GC3Denum target, GC3Denum pname, Excep tionCode&);

(...skipping 464 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
621 void loseContext();	621 void loseContext();

622 // Helper for restoration after context lost.	622 // Helper for restoration after context lost.

623 void maybeRestoreContext(LostContextMode);	623 void maybeRestoreContext(LostContextMode);

624	624

625 friend class WebGLStateRestorer;	625 friend class WebGLStateRestorer;

626 };	626 };

627	627

628 } // namespace WebCore	628 } // namespace WebCore

629	629

630 #endif	630 #endif

OLD	NEW