mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
bf48aecf29
nsIXPCScriptable flags handling in xpc_map_end.h is a bit of a mess. - Half the flags relate to whether various functions are defined (PreCreate, GetProperty, etc). These are set using the XPC_MAP_WANT_* macros; for each one xpc_map_end.h inserts the corresponding flag using the preprocessor (see XPC_MAP_CLASSNAME::GetScriptableFlags()). - The other half of the flags relate to other things (IS_GLOBAL_OBJECT, DONT_REFLECT_INTERFACE_NAMES, etc). These are set using the XPC_MAP_FLAGS macro. Having two similar but different mechanisms to set the flags for a class is confusing. (Indeed, until recently we had some classes where a single flag was redundantly specified via both mechanisms.) Note also that the classes done in dom/base/nsIDOMClassInfo.h also specify all the flags in a single value, similar to how XPC_MAP_FLAGS works. This patch removes the XPC_MAP_WANT_* macros. All flags are now set via XPC_MAP_FLAGS. This is a significant simplification to xpc_map_end.h and all the places that use it. The downside of this change is that I had to change the flag constants from class constants (i.e. nsIXPCScriptable::FOO) to macros (i.e. NSIXPCSCRIPTABLE_FOO) because they need to be used in #if statements like this in xpc_map_end.h: #if !((XPC_MAP_FLAGS) & NSIXPCSCRIPTABLE_WANT_PRECREATE) and you can't use a '::'-qualified name inside a #if. I think this downside is outweighed by the simplification described above. Overall the patch removes 80 lines of code. --HG-- extra : rebase_source : 6d5c341d0deba8f1529d81c17bb8819e09620b05
121 lines
4.6 KiB
C
121 lines
4.6 KiB
C
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* vim: set ts=8 sts=4 et sw=4 tw=99: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
// If you include this file you must also include xpc_make_class.h at the top
|
|
// of the file doing the including.
|
|
|
|
#ifndef XPC_MAP_CLASSNAME
|
|
#error "Must #define XPC_MAP_CLASSNAME before #including xpc_map_end.h"
|
|
#endif
|
|
|
|
#ifndef XPC_MAP_QUOTED_CLASSNAME
|
|
#error "Must #define XPC_MAP_QUOTED_CLASSNAME before #including xpc_map_end.h"
|
|
#endif
|
|
|
|
#ifndef XPC_MAP_FLAGS
|
|
#error "Must #define XPC_MAP_FLAGS before #including xpc_map_end.h"
|
|
#endif
|
|
|
|
#include "js/Id.h"
|
|
|
|
/**************************************************************/
|
|
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::GetClassName(char * *aClassName)
|
|
{
|
|
static const char sName[] = XPC_MAP_QUOTED_CLASSNAME;
|
|
*aClassName = (char*) nsMemory::Clone(sName, sizeof(sName));
|
|
return NS_OK;
|
|
}
|
|
|
|
/**************************************************************/
|
|
|
|
// virtual
|
|
uint32_t
|
|
XPC_MAP_CLASSNAME::GetScriptableFlags()
|
|
{
|
|
return (XPC_MAP_FLAGS);
|
|
}
|
|
|
|
// virtual
|
|
const js::Class*
|
|
XPC_MAP_CLASSNAME::GetClass()
|
|
{
|
|
static const js::ClassOps classOps =
|
|
XPC_MAKE_CLASS_OPS(GetScriptableFlags());
|
|
static const js::Class klass =
|
|
XPC_MAKE_CLASS(XPC_MAP_QUOTED_CLASSNAME, GetScriptableFlags(),
|
|
&classOps);
|
|
return &klass;
|
|
}
|
|
|
|
// virtual
|
|
const JSClass*
|
|
XPC_MAP_CLASSNAME::GetJSClass()
|
|
{
|
|
return Jsvalify(GetClass());
|
|
}
|
|
|
|
/**************************************************************/
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_PRECREATE)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::PreCreate(nsISupports* nativeObj, JSContext * cx, JSObject * globalObj, JSObject * *parentObj)
|
|
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_GETPROPERTY)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::GetProperty(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, jsid id, JS::Value * vp, bool* _retval)
|
|
{NS_WARNING("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_SETPROPERTY)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::SetProperty(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, jsid id, JS::Value * vp, bool* _retval)
|
|
{NS_WARNING("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_NEWENUMERATE)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::NewEnumerate(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, JS::AutoIdVector& properties, bool* _retval)
|
|
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_ENUMERATE)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::Enumerate(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, bool* _retval)
|
|
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_RESOLVE)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::Resolve(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, jsid id, bool* resolvedp, bool* _retval)
|
|
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_FINALIZE)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::Finalize(nsIXPConnectWrappedNative* wrapper, JSFreeOp * fop, JSObject * obj)
|
|
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_CALL)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::Call(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, const JS::CallArgs& args, bool* _retval)
|
|
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_CONSTRUCT)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::Construct(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, const JS::CallArgs& args, bool* _retval)
|
|
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
#if !((XPC_MAP_FLAGS) & XPC_SCRIPTABLE_WANT_HASINSTANCE)
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::HasInstance(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, JS::HandleValue val, bool* bp, bool* _retval)
|
|
{NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;}
|
|
#endif
|
|
|
|
NS_IMETHODIMP XPC_MAP_CLASSNAME::PostCreatePrototype(JSContext* cx, JSObject* proto)
|
|
{return NS_OK;}
|
|
|
|
/**************************************************************/
|
|
|
|
#undef XPC_MAP_CLASSNAME
|
|
#undef XPC_MAP_QUOTED_CLASSNAME
|
|
#undef XPC_MAP_FLAGS
|