mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 21:28:04 +02: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
72 lines
1.8 KiB
C++
72 lines
1.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
|
|
/* 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/. */
|
|
|
|
#include "reflect.h"
|
|
#include "jsapi.h"
|
|
#include "mozilla/ModuleUtils.h"
|
|
#include "nsMemory.h"
|
|
#include "nsString.h"
|
|
#include "nsNativeCharsetUtils.h"
|
|
#include "xpc_make_class.h"
|
|
|
|
#define JSREFLECT_CONTRACTID \
|
|
"@mozilla.org/jsreflect;1"
|
|
|
|
#define JSREFLECT_CID \
|
|
{ 0x1a817186, 0x357a, 0x47cd, { 0x8a, 0xea, 0x28, 0x50, 0xd6, 0x0e, 0x95, 0x9e } }
|
|
|
|
namespace mozilla {
|
|
namespace reflect {
|
|
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(Module)
|
|
|
|
NS_IMPL_ISUPPORTS(Module, nsIXPCScriptable)
|
|
|
|
Module::Module() = default;
|
|
|
|
Module::~Module() = default;
|
|
|
|
#define XPC_MAP_CLASSNAME Module
|
|
#define XPC_MAP_QUOTED_CLASSNAME "Module"
|
|
#define XPC_MAP_FLAGS XPC_SCRIPTABLE_WANT_CALL
|
|
#include "xpc_map_end.h"
|
|
|
|
NS_IMETHODIMP
|
|
Module::Call(nsIXPConnectWrappedNative* wrapper,
|
|
JSContext* cx,
|
|
JSObject* obj,
|
|
const JS::CallArgs& args,
|
|
bool* _retval)
|
|
{
|
|
JS::Rooted<JSObject*> global(cx, JS::CurrentGlobalOrNull(cx));
|
|
if (!global)
|
|
return NS_ERROR_NOT_AVAILABLE;
|
|
|
|
*_retval = JS_InitReflectParse(cx, global);
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace reflect
|
|
} // namespace mozilla
|
|
|
|
NS_DEFINE_NAMED_CID(JSREFLECT_CID);
|
|
|
|
static const mozilla::Module::CIDEntry kReflectCIDs[] = {
|
|
{ &kJSREFLECT_CID, false, nullptr, mozilla::reflect::ModuleConstructor },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module::ContractIDEntry kReflectContracts[] = {
|
|
{ JSREFLECT_CONTRACTID, &kJSREFLECT_CID },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module kReflectModule = {
|
|
mozilla::Module::kVersion,
|
|
kReflectCIDs,
|
|
kReflectContracts
|
|
};
|
|
|
|
NSMODULE_DEFN(jsreflect) = &kReflectModule;
|