Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 638328 - use builtinclass and remove do_QueryInterface - r=peterv

Browse Source
This commit is contained in:
Benoit Jacob 2011-10-13 08:09:22 -04:00
parent e2538cc5de
commit f9469573bd
5 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
content/canvas/src/WebGLContext.h
View File

@ -2110,10 +2110,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(WebGLExtension, WEBGLACTIVEINFO_PRIVATE_IID)
** Template implementations
**/
/* Helper function taking a BaseInterfaceType pointer and check that
* it matches the required concrete implementation type (if it's
* non-null), that it's not null/deleted unless we allowed it to, and
* obtain a pointer to the concrete object.
/* Helper function taking a BaseInterfaceType pointer, casting it to
* ConcreteObjectType and performing some checks along the way.
*
* By default, null (respectively: deleted) aInterface pointers are
* not allowed, but if you pass a non-null isNull (respectively:
@ -2151,12 +2149,18 @@ WebGLContext::GetConcreteObject(const char *info,
if (isNull)
*isNull = PR_FALSE;
nsresult rv;
nsCOMPtr<ConcreteObjectType> tmp(do_QueryInterface(aInterface, &rv));
if (NS_FAILED(rv))
return PR_FALSE;
*aConcreteObject = tmp;
#ifdef DEBUG
{
// once bug 694114 is implemented, we want to replace this by a static assertion, without #ifdef DEBUG
nsresult rv;
do_QueryInterface(aInterface, &rv);
NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv),
"QueryInterface failed. WebGL objects are builtinclass, so this should never happen. "
"Please file a bug at bugzilla.mozilla.org -> Core -> Canvas:WebGL and link to the present page.");
}
#endif
*aConcreteObject = static_cast<ConcreteObjectType*>(aInterface);
if (!(*aConcreteObject)->IsCompatibleWithContext(this)) {
// the object doesn't belong to this WebGLContext

1
content/canvas/test/webgl/failing_tests_linux.txt
View File

@ -17,5 +17,4 @@ conformance/uninitialized-test.html
conformance/more/conformance/quickCheckAPI.html
conformance/more/functions/copyTexImage2D.html
conformance/more/functions/copyTexSubImage2D.html
conformance/more/functions/deleteBufferBadArgs.html
conformance/more/functions/uniformfArrayLen1.html

1
content/canvas/test/webgl/failing_tests_mac.txt
View File

@ -13,6 +13,5 @@ conformance/texture-npot.html
conformance/more/conformance/quickCheckAPI.html
conformance/more/functions/copyTexImage2D.html
conformance/more/functions/copyTexSubImage2D.html
conformance/more/functions/deleteBufferBadArgs.html
conformance/more/functions/uniformfBadArgs.html
conformance/more/functions/uniformiBadArgs.html

1
content/canvas/test/webgl/failing_tests_windows.txt
View File

@ -8,5 +8,4 @@ conformance/read-pixels-test.html
conformance/more/conformance/quickCheckAPI.html
conformance/more/functions/copyTexImage2D.html
conformance/more/functions/copyTexSubImage2D.html
conformance/more/functions/deleteBufferBadArgs.html
conformance/more/functions/uniformfArrayLen1.html

24
dom/interfaces/canvas/nsIDOMWebGLRenderingContext.idl
View File

@ -74,50 +74,50 @@ struct TypedArray;
// OpenGL object wrappers
//
[scriptable, uuid(0df9f4ed-f5ff-4e51-a6ff-2bd9785a7639)]
[scriptable, builtinclass, uuid(0df9f4ed-f5ff-4e51-a6ff-2bd9785a7639)]
interface nsIWebGLTexture : nsISupports
{
[noscript] attribute WebGLuint name;
};
[scriptable, uuid(9eca9c32-8305-11de-b89b-000c29206271)]
[scriptable, builtinclass, uuid(9eca9c32-8305-11de-b89b-000c29206271)]
interface nsIWebGLBuffer : nsISupports
{
[noscript] attribute WebGLuint name;
};
[scriptable, uuid(a6a19e74-8305-11de-9ce9-000c29206271)]
[scriptable, builtinclass, uuid(a6a19e74-8305-11de-9ce9-000c29206271)]
interface nsIWebGLProgram : nsISupports
{
[noscript] attribute WebGLuint name;
};
[scriptable, uuid(ac7440a4-8305-11de-807b-000c29206271)]
[scriptable, builtinclass, uuid(ac7440a4-8305-11de-807b-000c29206271)]
interface nsIWebGLShader : nsISupports
{
[noscript] attribute WebGLuint name;
};
[scriptable, uuid(beea4b38-3094-4e8d-b6e6-8b21d07e8994)]
[scriptable, builtinclass, uuid(beea4b38-3094-4e8d-b6e6-8b21d07e8994)]
interface nsIWebGLShaderArray : nsISupports
{
readonly attribute unsigned long length;
nsIWebGLShader item(in unsigned long index);
};
[scriptable, uuid(bce8be60-8305-11de-9f3c-000c29206271)]
[scriptable, builtinclass, uuid(bce8be60-8305-11de-9f3c-000c29206271)]
interface nsIWebGLFramebuffer : nsISupports
{
[noscript] attribute WebGLuint name;
};
[scriptable, uuid(c82eacd0-8305-11de-9de9-000c29206271)]
[scriptable, builtinclass, uuid(c82eacd0-8305-11de-9de9-000c29206271)]
interface nsIWebGLRenderbuffer : nsISupports
{
[noscript] attribute WebGLuint name;
};
[scriptable, uuid(a85d4fd0-5b9f-4cb8-aeee-5a2c5c5bad76)]
[scriptable, builtinclass, uuid(a85d4fd0-5b9f-4cb8-aeee-5a2c5c5bad76)]
interface nsIWebGLActiveInfo : nsISupports
{
readonly attribute WebGLint size;
@ -125,7 +125,7 @@ interface nsIWebGLActiveInfo : nsISupports
readonly attribute DOMString name;
};
[scriptable, uuid(d38b0467-623e-4c82-9140-5f14a3bd1bad)]
[scriptable, builtinclass, uuid(d38b0467-623e-4c82-9140-5f14a3bd1bad)]
interface nsIWebGLUniformLocation : nsISupports
{
[noscript] attribute WebGLint location;
@ -134,7 +134,7 @@ interface nsIWebGLUniformLocation : nsISupports
/* Base class for all WebGL extensions, and for those without
* any additional tokens/methods.
*/
[scriptable, uuid(70814f32-a5c5-4b95-83d5-ac653bac3316)]
[scriptable, builtinclass, uuid(70814f32-a5c5-4b95-83d5-ac653bac3316)]
interface nsIWebGLExtension : nsISupports
{
};
@ -142,7 +142,7 @@ interface nsIWebGLExtension : nsISupports
/* Classes that extend on nsIWebGLExtension and provide
* extra tokens, functions, etc.
*/
[scriptable, uuid(3de3dfd9-864a-4e4c-989b-2977eaa80b7b)]
[scriptable, builtinclass, uuid(3de3dfd9-864a-4e4c-989b-2977eaa80b7b)]
interface nsIWebGLExtensionStandardDerivatives : nsIWebGLExtension
{
//
@ -154,7 +154,7 @@ interface nsIWebGLExtensionStandardDerivatives : nsIWebGLExtension
};
[scriptable, uuid(ef15ae85-4670-4dc4-848d-51ca81e8397a)]
[scriptable, builtinclass, uuid(ef15ae85-4670-4dc4-848d-51ca81e8397a)]
interface nsIDOMWebGLRenderingContext : nsISupports
{
//