summaryrefslogtreecommitdiff
path: root/dom/base/nsIDOMClassInfo.h
diff options
context:
space:
mode:
authorPale Moon <git-repo@palemoon.org>2016-09-01 13:39:08 +0200
committerPale Moon <git-repo@palemoon.org>2016-09-01 13:39:08 +0200
commit3d8ce1a11a7347cc94a937719c4bc8df46fb8d14 (patch)
tree8c26ca375a6312751c00a27e1653fb6f189f0463 /dom/base/nsIDOMClassInfo.h
parente449bdb1ec3a82f204bffdd9c3c54069d086eee3 (diff)
downloadpalemoon-gre-3d8ce1a11a7347cc94a937719c4bc8df46fb8d14.tar.gz
Base import of Tycho code (warning: huge commit)
Diffstat (limited to 'dom/base/nsIDOMClassInfo.h')
-rw-r--r--dom/base/nsIDOMClassInfo.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/dom/base/nsIDOMClassInfo.h b/dom/base/nsIDOMClassInfo.h
index dda62bcc1..8a65084fd 100644
--- a/dom/base/nsIDOMClassInfo.h
+++ b/dom/base/nsIDOMClassInfo.h
@@ -7,7 +7,6 @@
#define nsIDOMClassInfo_h___
#include "nsIClassInfoImpl.h"
-#include "nsVoidArray.h"
#include "nsDOMClassInfoID.h"
#include "nsIXPCScriptable.h"
#include "nsIServiceManager.h"
@@ -24,8 +23,7 @@
#define DEFAULT_SCRIPTABLE_FLAGS \
(DOM_BASE_SCRIPTABLE_FLAGS | \
- nsIXPCScriptable::WANT_NEWRESOLVE | \
- nsIXPCScriptable::WANT_CHECKACCESS | \
+ nsIXPCScriptable::WANT_RESOLVE | \
nsIXPCScriptable::WANT_PRECREATE)
#define DOM_DEFAULT_SCRIPTABLE_FLAGS \
@@ -34,7 +32,7 @@
nsIXPCScriptable::CLASSINFO_INTERFACES_ONLY)
-#ifdef _IMPL_NS_LAYOUT
+#ifdef MOZILLA_INTERNAL_API
// See nsDOMClassInfoID.h
@@ -57,7 +55,7 @@
sof->GetClassInfoInstance(eDOMClassInfo_##_class##_id); \
} else
-#endif /* _IMPL_NS_LAYOUT */
+#endif /* MOZILLA_INTERNAL_API */
// Looks up the nsIClassInfo for a class name registered with the
// nsScriptNamespaceManager. Remember to release NS_CLASSINFO_NAME(_class)
@@ -139,7 +137,7 @@ NS_DOMCI_EXTENSION_NAME(_module)::~NS_DOMCI_EXTENSION_NAME(_module)() \
{ \
} \
\
-NS_IMPL_ISUPPORTS1(NS_DOMCI_EXTENSION_NAME(_module), nsIDOMCIExtension) \
+NS_IMPL_ISUPPORTS(NS_DOMCI_EXTENSION_NAME(_module), nsIDOMCIExtension) \
\
NS_IMETHODIMP \
NS_DOMCI_EXTENSION_NAME(_module)::RegisterDOMCI(const char* aName, \