mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 13:25:37 +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
31 lines
1.5 KiB
C
31 lines
1.5 KiB
C
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#ifndef nsIDOMClassInfo_h___
|
|
#define nsIDOMClassInfo_h___
|
|
|
|
#include "nsIXPCScriptable.h"
|
|
|
|
#define DOM_BASE_SCRIPTABLE_FLAGS \
|
|
(XPC_SCRIPTABLE_USE_JSSTUB_FOR_ADDPROPERTY | \
|
|
XPC_SCRIPTABLE_USE_JSSTUB_FOR_DELPROPERTY | \
|
|
XPC_SCRIPTABLE_USE_JSSTUB_FOR_SETPROPERTY | \
|
|
XPC_SCRIPTABLE_ALLOW_PROP_MODS_TO_PROTOTYPE | \
|
|
XPC_SCRIPTABLE_DONT_ASK_INSTANCE_FOR_SCRIPTABLE | \
|
|
XPC_SCRIPTABLE_DONT_REFLECT_INTERFACE_NAMES)
|
|
|
|
#define DEFAULT_SCRIPTABLE_FLAGS \
|
|
(DOM_BASE_SCRIPTABLE_FLAGS | \
|
|
XPC_SCRIPTABLE_WANT_RESOLVE | \
|
|
XPC_SCRIPTABLE_WANT_PRECREATE)
|
|
|
|
#define DOM_DEFAULT_SCRIPTABLE_FLAGS \
|
|
(DEFAULT_SCRIPTABLE_FLAGS | \
|
|
XPC_SCRIPTABLE_DONT_ENUM_QUERY_INTERFACE | \
|
|
XPC_SCRIPTABLE_CLASSINFO_INTERFACES_ONLY)
|
|
|
|
#endif /* nsIDOMClassInfo_h___ */
|