From b4a17818613eab0f36e11ff58e4610ae3ea5e0e3 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Tue, 24 Feb 2004 03:22:35 +0000 Subject: [PATCH] Merge jsdom and gklayout libraries (bug 232247). r=dbaron, sr=jst. git-svn-id: svn://10.0.0.236/trunk@153136 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/allmakefiles.sh | 1 - mozilla/dom/src/Makefile.in | 2 +- mozilla/dom/src/base/Makefile.in | 8 +- mozilla/dom/src/base/nsDOMException.cpp | 47 ++ mozilla/dom/src/base/nsDOMException.h | 55 +- .../dom/src/base/nsDOMScriptObjectFactory.cpp | 212 ++++++ .../dom/src/base/nsDOMScriptObjectFactory.h | 76 ++ mozilla/dom/src/base/nsGlobalWindow.h | 4 + mozilla/dom/src/base/nsJSEnvironment.h | 4 + mozilla/dom/src/build/Makefile.in | 87 --- mozilla/dom/src/build/dom.pkg | 20 - mozilla/dom/src/build/nsDOMFactory.cpp | 387 ---------- .../src/build/nsScriptNameSpaceManager.cpp | 674 ------------------ .../dom/src/build/nsScriptNameSpaceManager.h | 151 ---- mozilla/dom/src/build/win32.order | 433 ----------- mozilla/dom/src/events/nsJSEventListener.h | 4 + .../config/basebrowser-installer-win.pkg | 1 - .../embedding/config/basebrowser-mac-macho | 6 - mozilla/embedding/config/basebrowser-qnx | 1 - mozilla/embedding/config/basebrowser-unix | 1 - mozilla/embedding/config/basebrowser-win | 1 - mozilla/embedding/config/minimo-unix | 1 - .../embedding/minimo/app/minimo-link-comps | 1 - mozilla/layout/build/Makefile.in | 8 + mozilla/layout/build/layout.pkg | 14 + mozilla/layout/build/nsLayoutModule.cpp | 88 +++ mozilla/mail/config/basemail-win | 1 - mozilla/modules/staticmod/Makefile.in | 5 +- mozilla/xpfe/bootstrap/os2turbo/mozturbo.cpp | 1 - mozilla/xpinstall/packager/os2/browser.jst | 1 + mozilla/xpinstall/packager/packages-os2 | 1 - mozilla/xpinstall/packager/packages-unix | 1 - mozilla/xpinstall/packager/unix/browser.jst | 1 + .../xpinstall/wizard/unix/src2/.LIBSREQD.list | 1 - 34 files changed, 473 insertions(+), 1826 deletions(-) create mode 100644 mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp create mode 100644 mozilla/dom/src/base/nsDOMScriptObjectFactory.h delete mode 100644 mozilla/dom/src/build/Makefile.in delete mode 100644 mozilla/dom/src/build/dom.pkg delete mode 100644 mozilla/dom/src/build/nsDOMFactory.cpp delete mode 100644 mozilla/dom/src/build/nsScriptNameSpaceManager.cpp delete mode 100644 mozilla/dom/src/build/nsScriptNameSpaceManager.h delete mode 100644 mozilla/dom/src/build/win32.order diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index bd221bf38c3..5dc9ba5951a 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/allmakefiles.sh @@ -95,7 +95,6 @@ dom/public/idl/xpath/Makefile dom/public/idl/xul/Makefile dom/src/Makefile dom/src/base/Makefile -dom/src/build/Makefile dom/src/events/Makefile dom/src/jsurl/Makefile " diff --git a/mozilla/dom/src/Makefile.in b/mozilla/dom/src/Makefile.in index 1c4036e74cd..428199d68ad 100644 --- a/mozilla/dom/src/Makefile.in +++ b/mozilla/dom/src/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = base jsurl events build +DIRS = base jsurl events include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index c3499074b7c..3fc991508bd 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -83,13 +83,13 @@ CPPSRCS = \ nsPluginArray.cpp \ nsWindowRoot.cpp \ nsDOMClassInfo.cpp \ + nsScriptNameSpaceManager.cpp \ + nsDOMScriptObjectFactory.cpp \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 +LOCAL_INCLUDES = -I$(srcdir)/../events + include $(topsrcdir)/config/rules.mk - -CXXFLAGS += -I$(srcdir) -I$(srcdir)/../build - - diff --git a/mozilla/dom/src/base/nsDOMException.cpp b/mozilla/dom/src/base/nsDOMException.cpp index 9692b7e3be3..50fb8c8f440 100644 --- a/mozilla/dom/src/base/nsDOMException.cpp +++ b/mozilla/dom/src/base/nsDOMException.cpp @@ -49,6 +49,53 @@ #define DOM_MSG_DEF(val, message) {(val), #val, message}, +#define IMPL_INTERNAL_DOM_EXCEPTION_HEAD(classname, ifname) \ +class classname : public nsBaseDOMException, \ + public ifname \ +{ \ +public: \ + classname(); \ + virtual ~classname(); \ + \ + NS_DECL_ISUPPORTS_INHERITED + +#define IMPL_INTERNAL_DOM_EXCEPTION_TAIL(classname, ifname, domname, module, \ + mapping_function) \ +}; \ + \ +classname::classname() {} \ +classname::~classname() {} \ + \ +NS_IMPL_ADDREF_INHERITED(classname, nsBaseDOMException) \ +NS_IMPL_RELEASE_INHERITED(classname, nsBaseDOMException) \ +NS_CLASSINFO_MAP_BEGIN(domname) \ + NS_CLASSINFO_MAP_ENTRY(nsIException) \ + NS_CLASSINFO_MAP_ENTRY(ifname) \ +NS_CLASSINFO_MAP_END \ +NS_INTERFACE_MAP_BEGIN(classname) \ + NS_INTERFACE_MAP_ENTRY(ifname) \ + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(domname) \ +NS_INTERFACE_MAP_END_INHERITING(nsBaseDOMException) \ + \ +nsresult \ +NS_New##domname(nsresult aNSResult, nsIException* aDefaultException, \ + nsIException** aException) \ +{ \ + if (!(NS_ERROR_GET_MODULE(aNSResult) == module)) { \ + NS_WARNING("Trying to create an exception for the wrong error module."); \ + return NS_ERROR_FAILURE; \ + } \ + const char* name; \ + const char* message; \ + mapping_function(aNSResult, &name, &message); \ + classname* inst = new classname(); \ + NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY); \ + inst->Init(aNSResult, name, message, aDefaultException); \ + *aException = inst; \ + NS_ADDREF(*aException); \ + return NS_OK; \ +} + static struct ResultStruct { nsresult mNSResult; diff --git a/mozilla/dom/src/base/nsDOMException.h b/mozilla/dom/src/base/nsDOMException.h index 2e5c0cfee27..1d7446e63ac 100644 --- a/mozilla/dom/src/base/nsDOMException.h +++ b/mozilla/dom/src/base/nsDOMException.h @@ -61,52 +61,11 @@ protected: nsCOMPtr mInner; }; -#define IMPL_INTERNAL_DOM_EXCEPTION_HEAD(classname, ifname) \ -class classname : public nsBaseDOMException, \ - public ifname \ -{ \ -public: \ - classname(); \ - virtual ~classname(); \ - \ - NS_DECL_ISUPPORTS_INHERITED +#define DECL_INTERNAL_DOM_EXCEPTION(domname) \ +nsresult \ +NS_New##domname(nsresult aNSResult, nsIException* aDefaultException, \ + nsIException** aException) -#define IMPL_INTERNAL_DOM_EXCEPTION_TAIL(classname, ifname, domname, module, \ - mapping_function) \ -}; \ - \ -classname::classname() {} \ -classname::~classname() {} \ - \ -NS_IMPL_ADDREF_INHERITED(classname, nsBaseDOMException) \ -NS_IMPL_RELEASE_INHERITED(classname, nsBaseDOMException) \ -NS_CLASSINFO_MAP_BEGIN(domname) \ - NS_CLASSINFO_MAP_ENTRY(nsIException) \ - NS_CLASSINFO_MAP_ENTRY(ifname) \ -NS_CLASSINFO_MAP_END \ -NS_INTERFACE_MAP_BEGIN(classname) \ - NS_INTERFACE_MAP_ENTRY(ifname) \ - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(domname) \ -NS_INTERFACE_MAP_END_INHERITING(nsBaseDOMException) \ - \ -nsresult \ -NS_New##domname(nsresult aNSResult, nsIException* aDefaultException, \ - nsIException** aException); \ -nsresult \ -NS_New##domname(nsresult aNSResult, nsIException* aDefaultException, \ - nsIException** aException) \ -{ \ - if (!(NS_ERROR_GET_MODULE(aNSResult) == module)) { \ - NS_WARNING("Trying to create an exception for the wrong error module."); \ - return NS_ERROR_FAILURE; \ - } \ - const char* name; \ - const char* message; \ - mapping_function(aNSResult, &name, &message); \ - classname* inst = new classname(); \ - NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY); \ - inst->Init(aNSResult, name, message, aDefaultException); \ - *aException = inst; \ - NS_ADDREF(*aException); \ - return NS_OK; \ -} + +DECL_INTERNAL_DOM_EXCEPTION(DOMException); +DECL_INTERNAL_DOM_EXCEPTION(RangeException); diff --git a/mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp b/mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp new file mode 100644 index 00000000000..eab4bcf56d6 --- /dev/null +++ b/mozilla/dom/src/base/nsDOMScriptObjectFactory.cpp @@ -0,0 +1,212 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * + * + * This Original Code has been modified by IBM Corporation. + * Modifications made by IBM described herein are + * Copyright (c) International Business Machines + * Corporation, 2000 + * + * Modifications to Mozilla code or documentation + * identified per MPL Section 3.3 + * + * Date Modified by Description of modification + * 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink + * use in OS2 + */ + +#include "nsDOMScriptObjectFactory.h" +#include "nsScriptNameSpaceManager.h" +#include "nsIObserverService.h" +#include "nsJSEnvironment.h" +#include "nsJSEventListener.h" +#include "nsGlobalWindow.h" +#include "nsIXULPrototypeCache.h" +#include "nsIJSContextStack.h" +#include "nsDOMException.h" + +nsDOMScriptObjectFactory::nsDOMScriptObjectFactory() +{ + nsCOMPtr observerService = + do_GetService("@mozilla.org/observer-service;1"); + + if (observerService) { + observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE); + } + + nsCOMPtr xs = + do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID); + + if (xs) { + xs->RegisterExceptionProvider(this, NS_ERROR_MODULE_DOM); + xs->RegisterExceptionProvider(this, NS_ERROR_MODULE_DOM_RANGE); + } +} + +NS_INTERFACE_MAP_BEGIN(nsDOMScriptObjectFactory) + NS_INTERFACE_MAP_ENTRY(nsIDOMScriptObjectFactory) + NS_INTERFACE_MAP_ENTRY(nsIObserver) + NS_INTERFACE_MAP_ENTRY(nsIExceptionProvider) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMScriptObjectFactory) +NS_INTERFACE_MAP_END + + +NS_IMPL_ADDREF(nsDOMScriptObjectFactory) +NS_IMPL_RELEASE(nsDOMScriptObjectFactory) + + +NS_IMETHODIMP +nsDOMScriptObjectFactory::NewScriptContext(nsIScriptGlobalObject *aGlobal, + nsIScriptContext **aContext) +{ + return NS_CreateScriptContext(aGlobal, aContext); +} + +NS_IMETHODIMP +nsDOMScriptObjectFactory::NewJSEventListener(nsIScriptContext *aContext, + nsISupports *aObject, + nsIDOMEventListener **aInstancePtrResult) +{ + return NS_NewJSEventListener(aInstancePtrResult, aContext, aObject); +} + +NS_IMETHODIMP +nsDOMScriptObjectFactory::NewScriptGlobalObject(PRBool aIsChrome, + nsIScriptGlobalObject **aGlobal) +{ + return NS_NewScriptGlobalObject(aIsChrome, aGlobal); +} + +NS_IMETHODIMP_(nsISupports *) +nsDOMScriptObjectFactory::GetClassInfoInstance(nsDOMClassInfoID aID) +{ + return nsDOMClassInfo::GetClassInfoInstance(aID); +} + +NS_IMETHODIMP_(nsISupports *) +nsDOMScriptObjectFactory::GetExternalClassInfoInstance(const nsAString& aName) +{ + extern nsScriptNameSpaceManager *gNameSpaceManager; + + NS_ENSURE_TRUE(gNameSpaceManager, nsnull); + + const nsGlobalNameStruct *globalStruct; + gNameSpaceManager->LookupName(aName, &globalStruct); + if (globalStruct) { + if (globalStruct->mType == nsGlobalNameStruct::eTypeExternalClassInfoCreator) { + nsresult rv; + nsCOMPtr creator(do_CreateInstance(globalStruct->mCID, &rv)); + NS_ENSURE_SUCCESS(rv, nsnull); + + rv = creator->RegisterDOMCI(NS_ConvertUCS2toUTF8(aName).get(), this); + NS_ENSURE_SUCCESS(rv, nsnull); + + rv = gNameSpaceManager->LookupName(aName, &globalStruct); + NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && globalStruct, nsnull); + + NS_ASSERTION(globalStruct->mType == nsGlobalNameStruct::eTypeExternalClassInfo, + "The classinfo data for this class didn't get registered."); + } + if (globalStruct->mType == nsGlobalNameStruct::eTypeExternalClassInfo) { + return nsDOMClassInfo::GetClassInfoInstance(globalStruct->mData); + } + } + return nsnull; +} + +NS_IMETHODIMP +nsDOMScriptObjectFactory::Observe(nsISupports *aSubject, + const char *aTopic, + const PRUnichar *someData) +{ + if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) { +#ifdef MOZ_XUL + // Flush the XUL cache since it holds JS roots, and we're about to + // start the final GC. + nsCOMPtr cache = + do_GetService("@mozilla.org/xul/xul-prototype-cache;1"); + + if (cache) + cache->Flush(); +#endif + + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1"); + + if (stack) { + JSContext *cx = nsnull; + + stack->GetSafeJSContext(&cx); + + if (cx) { + // Do one final GC to clean things up before shutdown. + + ::JS_GC(cx); + } + } + + GlobalWindowImpl::ShutDown(); + nsDOMClassInfo::ShutDown(); + nsJSEnvironment::ShutDown(); + + nsCOMPtr xs = + do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID); + + if (xs) { + xs->UnregisterExceptionProvider(this, NS_ERROR_MODULE_DOM); + } + } + + return NS_OK; +} + +NS_IMETHODIMP +nsDOMScriptObjectFactory::GetException(nsresult result, + nsIException *aDefaultException, + nsIException **_retval) +{ + if (NS_ERROR_GET_MODULE(result) == NS_ERROR_MODULE_DOM_RANGE) { + return NS_NewRangeException(result, aDefaultException, _retval); + } + return NS_NewDOMException(result, aDefaultException, _retval); +} + +NS_IMETHODIMP +nsDOMScriptObjectFactory::RegisterDOMClassInfo(const char *aName, + nsDOMClassInfoExternalConstructorFnc aConstructorFptr, + const nsIID *aProtoChainInterface, + const nsIID **aInterfaces, + PRUint32 aScriptableFlags, + PRBool aHasClassInterface, + const nsCID *aConstructorCID) +{ + extern nsScriptNameSpaceManager *gNameSpaceManager; + + NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); + + return gNameSpaceManager->RegisterDOMCIData(aName, + aConstructorFptr, + aProtoChainInterface, + aInterfaces, + aScriptableFlags, + aHasClassInterface, + aConstructorCID); +} diff --git a/mozilla/dom/src/base/nsDOMScriptObjectFactory.h b/mozilla/dom/src/base/nsDOMScriptObjectFactory.h new file mode 100644 index 00000000000..41be055b84e --- /dev/null +++ b/mozilla/dom/src/base/nsDOMScriptObjectFactory.h @@ -0,0 +1,76 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * + * + * This Original Code has been modified by IBM Corporation. + * Modifications made by IBM described herein are + * Copyright (c) International Business Machines + * Corporation, 2000 + * + * Modifications to Mozilla code or documentation + * identified per MPL Section 3.3 + * + * Date Modified by Description of modification + * 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink + * use in OS2 + */ + +#include "nsIDOMScriptObjectFactory.h" +#include "nsIObserver.h" +#include "nsIExceptionService.h" + +class nsDOMScriptObjectFactory : public nsIDOMScriptObjectFactory, + public nsIObserver, + public nsIExceptionProvider +{ +public: + nsDOMScriptObjectFactory(); + + NS_DECL_ISUPPORTS + + // nsIObserver + NS_DECL_NSIOBSERVER + + // nsIExceptionProvider + NS_DECL_NSIEXCEPTIONPROVIDER + + // nsIDOMScriptObjectFactory + NS_IMETHOD NewScriptContext(nsIScriptGlobalObject *aGlobal, + nsIScriptContext **aContext); + + NS_IMETHOD NewJSEventListener(nsIScriptContext *aContext, + nsISupports *aObject, + nsIDOMEventListener **aInstancePtrResult); + + NS_IMETHOD NewScriptGlobalObject(PRBool aIsChrome, + nsIScriptGlobalObject **aGlobal); + + NS_IMETHOD_(nsISupports *)GetClassInfoInstance(nsDOMClassInfoID aID); + NS_IMETHOD_(nsISupports *)GetExternalClassInfoInstance(const nsAString& aName); + + NS_IMETHOD RegisterDOMClassInfo(const char *aName, + nsDOMClassInfoExternalConstructorFnc aConstructorFptr, + const nsIID *aProtoChainInterface, + const nsIID **aInterfaces, + PRUint32 aScriptableFlags, + PRBool aHasClassInterface, + const nsCID *aConstructorCID); +}; diff --git a/mozilla/dom/src/base/nsGlobalWindow.h b/mozilla/dom/src/base/nsGlobalWindow.h index 5afcdf9411b..a09495a6ad9 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.h +++ b/mozilla/dom/src/base/nsGlobalWindow.h @@ -517,4 +517,8 @@ protected: nsIDocShell *mDocShell; // Weak Reference }; +/* factory function */ +nsresult NS_NewScriptGlobalObject(PRBool aIsChrome, + nsIScriptGlobalObject **aResult); + #endif /* nsGlobalWindow_h___ */ diff --git a/mozilla/dom/src/base/nsJSEnvironment.h b/mozilla/dom/src/base/nsJSEnvironment.h index f271e04cf59..d06ab953489 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.h +++ b/mozilla/dom/src/base/nsJSEnvironment.h @@ -189,6 +189,10 @@ public: static void ShutDown(); }; +/* factory function */ +nsresult NS_CreateScriptContext(nsIScriptGlobalObject *aGlobal, + nsIScriptContext **aContext); + /* prototypes */ void JS_DLL_CALLBACK NS_ScriptErrorReporter(JSContext *cx, const char *message, JSErrorReport *report); diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in deleted file mode 100644 index 9f49c938f6a..00000000000 --- a/mozilla/dom/src/build/Makefile.in +++ /dev/null @@ -1,87 +0,0 @@ -# -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = dom -LIBRARY_NAME = jsdom -EXPORT_LIBRARY = 1 - -PACKAGE_FILE = dom.pkg - -REQUIRES = xpcom \ - string \ - js \ - xpconnect \ - widget \ - gfx \ - layout \ - content \ - caps \ - webbrwsr \ - commandhandler \ - xuldoc \ - docshell \ - plugin \ - necko \ - jsurl \ - uconv \ - $(NULL) - -IS_COMPONENT=1 -MODULE_NAME = DOM_components - -ifeq ($(OS_ARCH),WINNT) -EXTRA_DSO_LIBS = gkgfx -endif - -ifdef NS_TRACE_MALLOC -EXTRA_DSO_LIBS += tracemalloc -endif - -CPPSRCS = \ - nsDOMFactory.cpp \ - nsScriptNameSpaceManager.cpp \ - $(NULL) - -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)jsdomevents_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)jsurl_s.$(LIB_SUFFIX) \ - $(NULL) - -EXTRA_DSO_LDOPTS = \ - $(LIBS_DIR) \ - $(EXTRA_DSO_LIBS) \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - -INCLUDES += -I$(srcdir)/../base - diff --git a/mozilla/dom/src/build/dom.pkg b/mozilla/dom/src/build/dom.pkg deleted file mode 100644 index 5ce30f27ad4..00000000000 --- a/mozilla/dom/src/build/dom.pkg +++ /dev/null @@ -1,20 +0,0 @@ -[gecko] -#if SHARED_LIBRARY -dist/bin/components/@SHARED_LIBRARY@ -#else -!staticcomp @LIBRARY@ @MODULE_NAME@ -#endif -!xpt dist/bin/components/dom.xpt -!xpt dist/bin/components/dom_base.xpt -!xpt dist/bin/components/dom_core.xpt -!xpt dist/bin/components/dom_css.xpt -!xpt dist/bin/components/dom_events.xpt -!xpt dist/bin/components/dom_html.xpt -!xpt dist/bin/components/dom_range.xpt -!xpt dist/bin/components/dom_stylesheets.xpt -!xpt dist/bin/components/dom_traversal.xpt -!xpt dist/bin/components/dom_views.xpt -!xpt dist/bin/components/dom_xbl.xpt -!xpt dist/bin/components/dom_xul.xpt -!xpt dist/bin/components/dom_xpath.xpt -!xpt dist/bin/components/jsurl.xpt diff --git a/mozilla/dom/src/build/nsDOMFactory.cpp b/mozilla/dom/src/build/nsDOMFactory.cpp deleted file mode 100644 index b34025fc4ab..00000000000 --- a/mozilla/dom/src/build/nsDOMFactory.cpp +++ /dev/null @@ -1,387 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 2000 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink - * use in OS2 - */ -#include "nscore.h" -#include "nsIGenericFactory.h" - -#include "nsJSEnvironment.h" -#include "nsIScriptGlobalObject.h" -#include "nsDOMCID.h" -#include "nsIDOMScriptObjectFactory.h" -#include "nsIJSEventListener.h" -#include "nsIScriptContext.h" -#include "nsDOMClassInfo.h" -#include "nsGlobalWindow.h" -#include "nsIObserverService.h" -#include "nsIJSContextStack.h" -#include "nsIExceptionService.h" -#ifdef MOZ_XUL -#include "nsIXULPrototypeCache.h" -#endif -#include "nsCRT.h" - -#include "nsIController.h" -#include "nsIControllerContext.h" -#include "nsIControllerCommandTable.h" -#include "nsGlobalWindowCommands.h" - -#include "nsScriptNameSpaceManager.h" -#include "nsDOMException.h" - -#include "nsJSProtocolHandler.h" - - -#define NS_WINDOWCOMMANDTABLE_CID \ - { /* 0DE2FBFA-6B7F-11D7-BBBA-0003938A9D96 */ \ - 0x0DE2FBFA, 0x6B7F, 0x11D7, {0xBB, 0xBA, 0x00, 0x03, 0x93, 0x8A, 0x9D, 0x96} } - -static NS_DEFINE_CID(kWindowCommandTableCID, NS_WINDOWCOMMANDTABLE_CID); - - -extern nsresult NS_CreateScriptContext(nsIScriptGlobalObject *aGlobal, - nsIScriptContext **aContext); - -extern nsresult NS_NewJSEventListener(nsIDOMEventListener **aInstancePtrResult, - nsIScriptContext *aContext, - nsISupports *aObject); - -extern nsresult NS_NewScriptGlobalObject(PRBool aIsChrome, - nsIScriptGlobalObject **aGlobal); - -extern nsresult NS_NewDOMException(nsresult aResult, - nsIException* aDefaultException, - nsIException** aException); - -extern nsresult NS_NewRangeException(nsresult aResult, - nsIException* aDefaultException, - nsIException** aException); - - -////////////////////////////////////////////////////////////////////// - -class nsDOMSOFactory : public nsIDOMScriptObjectFactory, - public nsIObserver, - public nsIExceptionProvider -{ -public: - nsDOMSOFactory(); - virtual ~nsDOMSOFactory(); - - NS_DECL_ISUPPORTS - - // nsIObserver - NS_DECL_NSIOBSERVER - - // nsIExceptionProvider - NS_DECL_NSIEXCEPTIONPROVIDER - - NS_IMETHOD NewScriptContext(nsIScriptGlobalObject *aGlobal, - nsIScriptContext **aContext); - - NS_IMETHOD NewJSEventListener(nsIScriptContext *aContext, - nsISupports* aObject, - nsIDOMEventListener ** aInstancePtrResult); - - NS_IMETHOD NewScriptGlobalObject(PRBool aIsChrome, - nsIScriptGlobalObject **aGlobal); - - NS_IMETHOD_(nsISupports *)GetClassInfoInstance(nsDOMClassInfoID aID); - NS_IMETHOD_(nsISupports *)GetExternalClassInfoInstance(const nsAString& aName); - - NS_IMETHOD RegisterDOMClassInfo(const char *aName, - nsDOMClassInfoExternalConstructorFnc aConstructorFptr, - const nsIID *aProtoChainInterface, - const nsIID **aInterfaces, - PRUint32 aScriptableFlags, - PRBool aHasClassInterface, - const nsCID *aConstructorCID); -}; - -nsDOMSOFactory::nsDOMSOFactory() -{ - - nsCOMPtr observerService = - do_GetService("@mozilla.org/observer-service;1"); - - if (observerService) { - observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE); - } - - nsCOMPtr xs = - do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID); - - if (xs) { - xs->RegisterExceptionProvider(this, NS_ERROR_MODULE_DOM); - xs->RegisterExceptionProvider(this, NS_ERROR_MODULE_DOM_RANGE); - } -} - -nsDOMSOFactory::~nsDOMSOFactory() -{ -} - - -NS_INTERFACE_MAP_BEGIN(nsDOMSOFactory) - NS_INTERFACE_MAP_ENTRY(nsIDOMScriptObjectFactory) - NS_INTERFACE_MAP_ENTRY(nsIObserver) - NS_INTERFACE_MAP_ENTRY(nsIExceptionProvider) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMScriptObjectFactory) -NS_INTERFACE_MAP_END - - -NS_IMPL_ADDREF(nsDOMSOFactory) -NS_IMPL_RELEASE(nsDOMSOFactory) - - -NS_IMETHODIMP -nsDOMSOFactory::NewScriptContext(nsIScriptGlobalObject *aGlobal, - nsIScriptContext **aContext) -{ - return NS_CreateScriptContext(aGlobal, aContext); -} - -NS_IMETHODIMP -nsDOMSOFactory::NewJSEventListener(nsIScriptContext *aContext, - nsISupports *aObject, - nsIDOMEventListener **aInstancePtrResult) -{ - return NS_NewJSEventListener(aInstancePtrResult, aContext, aObject); -} - -NS_IMETHODIMP -nsDOMSOFactory::NewScriptGlobalObject(PRBool aIsChrome, - nsIScriptGlobalObject **aGlobal) -{ - return NS_NewScriptGlobalObject(aIsChrome, aGlobal); -} - -NS_IMETHODIMP_(nsISupports *) -nsDOMSOFactory::GetClassInfoInstance(nsDOMClassInfoID aID) -{ - return nsDOMClassInfo::GetClassInfoInstance(aID); -} - -NS_IMETHODIMP_(nsISupports *) -nsDOMSOFactory::GetExternalClassInfoInstance(const nsAString& aName) -{ - extern nsScriptNameSpaceManager *gNameSpaceManager; - - NS_ENSURE_TRUE(gNameSpaceManager, nsnull); - - const nsGlobalNameStruct *globalStruct; - gNameSpaceManager->LookupName(aName, &globalStruct); - if (globalStruct) { - if (globalStruct->mType == nsGlobalNameStruct::eTypeExternalClassInfoCreator) { - nsresult rv; - nsCOMPtr creator(do_CreateInstance(globalStruct->mCID, &rv)); - NS_ENSURE_SUCCESS(rv, nsnull); - - rv = creator->RegisterDOMCI(NS_ConvertUCS2toUTF8(aName).get(), this); - NS_ENSURE_SUCCESS(rv, nsnull); - - rv = gNameSpaceManager->LookupName(aName, &globalStruct); - NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && globalStruct, nsnull); - - NS_ASSERTION(globalStruct->mType == nsGlobalNameStruct::eTypeExternalClassInfo, - "The classinfo data for this class didn't get registered."); - } - if (globalStruct->mType == nsGlobalNameStruct::eTypeExternalClassInfo) { - return nsDOMClassInfo::GetClassInfoInstance(globalStruct->mData); - } - } - return nsnull; -} - -NS_IMETHODIMP -nsDOMSOFactory::Observe(nsISupports *aSubject, - const char *aTopic, - const PRUnichar *someData) -{ - if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) { -#ifdef MOZ_XUL - // Flush the XUL cache since it holds JS roots, and we're about to - // start the final GC. - nsCOMPtr cache = - do_GetService("@mozilla.org/xul/xul-prototype-cache;1"); - - if (cache) - cache->Flush(); -#endif - - nsCOMPtr stack = - do_GetService("@mozilla.org/js/xpc/ContextStack;1"); - - if (stack) { - JSContext *cx = nsnull; - - stack->GetSafeJSContext(&cx); - - if (cx) { - // Do one final GC to clean things up before shutdown. - - ::JS_GC(cx); - } - } - - GlobalWindowImpl::ShutDown(); - nsDOMClassInfo::ShutDown(); - nsJSEnvironment::ShutDown(); - - nsCOMPtr xs = - do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID); - - if (xs) { - xs->UnregisterExceptionProvider(this, NS_ERROR_MODULE_DOM); - } - } - - return NS_OK; -} - -NS_IMETHODIMP -nsDOMSOFactory::GetException(nsresult result, nsIException *aDefaultException, - nsIException **_retval) -{ - if (NS_ERROR_GET_MODULE(result) == NS_ERROR_MODULE_DOM_RANGE) { - return NS_NewRangeException(result, aDefaultException, _retval); - } - return NS_NewDOMException(result, aDefaultException, _retval); -} - -NS_IMETHODIMP -nsDOMSOFactory::RegisterDOMClassInfo(const char *aName, - nsDOMClassInfoExternalConstructorFnc aConstructorFptr, - const nsIID *aProtoChainInterface, - const nsIID **aInterfaces, - PRUint32 aScriptableFlags, - PRBool aHasClassInterface, - const nsCID *aConstructorCID) -{ - extern nsScriptNameSpaceManager *gNameSpaceManager; - - NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED); - - return gNameSpaceManager->RegisterDOMCIData(aName, - aConstructorFptr, - aProtoChainInterface, - aInterfaces, - aScriptableFlags, - aHasClassInterface, - aConstructorCID); -} - -////////////////////////////////////////////////////////////////////// - -static NS_METHOD -CreateWindowCommandTableConstructor(nsISupports *aOuter, - REFNSIID aIID, void **aResult) -{ - nsresult rv; - nsCOMPtr commandTable = - do_CreateInstance(NS_CONTROLLERCOMMANDTABLE_CONTRACTID, &rv); - if (NS_FAILED(rv)) return rv; - - rv = nsWindowCommandRegistration::RegisterWindowCommands(commandTable); - if (NS_FAILED(rv)) return rv; - - return commandTable->QueryInterface(aIID, aResult); -} - -static NS_METHOD -CreateWindowControllerWithSingletonCommandTable(nsISupports *aOuter, - REFNSIID aIID, void **aResult) -{ - nsresult rv; - nsCOMPtr controller = - do_CreateInstance("@mozilla.org/embedcomp/base-command-controller;1", &rv); - if (NS_FAILED(rv)) return rv; - - nsCOMPtr windowCommandTable = do_GetService(kWindowCommandTableCID, &rv); - if (NS_FAILED(rv)) return rv; - - // this is a singleton; make it immutable - windowCommandTable->MakeImmutable(); - - nsCOMPtr controllerContext = do_QueryInterface(controller, &rv); - if (NS_FAILED(rv)) return rv; - - controllerContext->Init(windowCommandTable); - if (NS_FAILED(rv)) return rv; - - return controller->QueryInterface(aIID, aResult); -} - -////////////////////////////////////////////////////////////////////// - -NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMSOFactory) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsBaseDOMException) - -static const nsModuleComponentInfo gDOMModuleInfo[] = { - { "Script Object Factory", - NS_DOM_SCRIPT_OBJECT_FACTORY_CID, - nsnull, - nsDOMSOFactoryConstructor - }, - { "Base DOM Exception", - NS_BASE_DOM_EXCEPTION_CID, - nsnull, - nsBaseDOMExceptionConstructor - }, - { "JavaScript Protocol Handler", - NS_JSPROTOCOLHANDLER_CID, - NS_JSPROTOCOLHANDLER_CONTRACTID, - nsJSProtocolHandler::Create }, - { "Window Command Table", - NS_WINDOWCOMMANDTABLE_CID, - "", - CreateWindowCommandTableConstructor - }, - { "Window Command Controller", - NS_WINDOWCONTROLLER_CID, - NS_WINDOWCONTROLLER_CONTRACTID, - CreateWindowControllerWithSingletonCommandTable - }, -}; - -void PR_CALLBACK -DOMModuleDestructor(nsIModule *self) -{ - GlobalWindowImpl::ShutDown(); - nsDOMClassInfo::ShutDown(); -} - -NS_IMPL_NSGETMODULE_WITH_DTOR(DOM_components, gDOMModuleInfo, - DOMModuleDestructor) - - diff --git a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp deleted file mode 100644 index 968cd4a0eb8..00000000000 --- a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp +++ /dev/null @@ -1,674 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsScriptNameSpaceManager.h" -#include "nsCOMPtr.h" -#include "nsIComponentManager.h" -#include "nsICategoryManager.h" -#include "nsIServiceManager.h" -#include "nsXPCOM.h" -#include "nsISupportsPrimitives.h" -#include "nsIScriptExternalNameSet.h" -#include "nsIScriptNameSpaceManager.h" -#include "nsIScriptContext.h" -#include "nsIInterfaceInfoManager.h" -#include "nsIInterfaceInfo.h" -#include "xptinfo.h" -#include "nsXPIDLString.h" -#include "nsReadableUtils.h" -#include "nsDOMClassInfo.h" -#include "nsCRT.h" - -#define NS_INTERFACE_PREFIX "nsI" -#define NS_DOM_INTERFACE_PREFIX "nsIDOM" - -// Our extended PLDHashEntryHdr -class GlobalNameMapEntry : public PLDHashEntryHdr -{ -public: - // Our hash table ops don't care about the order of these members - nsString mKey; - nsGlobalNameStruct mGlobalName; -}; - - -PR_STATIC_CALLBACK(const void *) -GlobalNameHashGetKey(PLDHashTable *table, PLDHashEntryHdr *entry) -{ - GlobalNameMapEntry *e = NS_STATIC_CAST(GlobalNameMapEntry *, entry); - - return NS_STATIC_CAST(const nsAString *, &e->mKey); -} - -PR_STATIC_CALLBACK(PLDHashNumber) -GlobalNameHashHashKey(PLDHashTable *table, const void *key) -{ - const nsAString *str = NS_STATIC_CAST(const nsAString *, key); - - return HashString(*str); -} - -PR_STATIC_CALLBACK(PRBool) -GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, - const void *key) -{ - const GlobalNameMapEntry *e = - NS_STATIC_CAST(const GlobalNameMapEntry *, entry); - const nsAString *str = NS_STATIC_CAST(const nsAString *, key); - - return str->Equals(e->mKey); -} - -PR_STATIC_CALLBACK(void) -GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) -{ - GlobalNameMapEntry *e = NS_STATIC_CAST(GlobalNameMapEntry *, entry); - - // An entry is being cleared, let the key (nsString) do its own - // cleanup. - e->mKey.~nsString(); - if (e->mGlobalName.mType == nsGlobalNameStruct::eTypeExternalClassInfo) { - nsIClassInfo* ci = GET_CLEAN_CI_PTR(e->mGlobalName.mData->mCachedClassInfo); - - // If we constructed an internal helper, we'll let the helper delete - // the nsDOMClassInfoData structure, if not we do it here. - if (!ci || e->mGlobalName.mData->u.mExternalConstructorFptr) { - delete e->mGlobalName.mData; - } - - // Release our pointer to the helper. - NS_IF_RELEASE(ci); - } - else if (e->mGlobalName.mType == nsGlobalNameStruct::eTypeExternalConstructorAlias) { - delete e->mGlobalName.mAlias; - } - - // This will set e->mGlobalName.mType to - // nsGlobalNameStruct::eTypeNotInitialized - memset(&e->mGlobalName, 0, sizeof(nsGlobalNameStruct)); -} - -PR_STATIC_CALLBACK(PRBool) -GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, - const void *key) -{ - GlobalNameMapEntry *e = NS_STATIC_CAST(GlobalNameMapEntry *, entry); - const nsAString *keyStr = NS_STATIC_CAST(const nsAString *, key); - - // Initialize the key in the entry with placement new - new (&e->mKey) nsString(*keyStr); - - // This will set e->mGlobalName.mType to - // nsGlobalNameStruct::eTypeNotInitialized - memset(&e->mGlobalName, 0, sizeof(nsGlobalNameStruct)); - return PR_TRUE; -} - -nsScriptNameSpaceManager::nsScriptNameSpaceManager() - : mIsInitialized(PR_FALSE) -{ -} - -nsScriptNameSpaceManager::~nsScriptNameSpaceManager() -{ - if (mIsInitialized) { - // Destroy the hash - PL_DHashTableFinish(&mGlobalNames); - } -} - -nsGlobalNameStruct * -nsScriptNameSpaceManager::AddToHash(const char *aKey) -{ - NS_ConvertASCIItoUTF16 key(aKey); - GlobalNameMapEntry *entry = - NS_STATIC_CAST(GlobalNameMapEntry *, - PL_DHashTableOperate(&mGlobalNames, &key, PL_DHASH_ADD)); - - if (!entry) { - return nsnull; - } - - return &entry->mGlobalName; -} - -nsGlobalNameStruct* -nsScriptNameSpaceManager::GetConstructorProto(const nsGlobalNameStruct* aStruct) -{ - NS_ASSERTION(aStruct->mType == nsGlobalNameStruct::eTypeExternalConstructorAlias, - "This function only works on constructor aliases!"); - if (!aStruct->mAlias->mProto) { - GlobalNameMapEntry *proto = - NS_STATIC_CAST(GlobalNameMapEntry *, - PL_DHashTableOperate(&mGlobalNames, - &aStruct->mAlias->mProtoName, - PL_DHASH_LOOKUP)); - - if (PL_DHASH_ENTRY_IS_BUSY(proto)) { - aStruct->mAlias->mProto = &proto->mGlobalName; - } - } - return aStruct->mAlias->mProto; -} - -nsresult -nsScriptNameSpaceManager::FillHash(nsICategoryManager *aCategoryManager, - const char *aCategory, - nsGlobalNameStruct::nametype aType) -{ - nsCOMPtr e; - nsresult rv = aCategoryManager->EnumerateCategory(aCategory, - getter_AddRefs(e)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCAutoString categoryEntry; - nsXPIDLCString contractId; - nsCOMPtr entry; - - while (NS_SUCCEEDED(e->GetNext(getter_AddRefs(entry)))) { - nsCOMPtr category(do_QueryInterface(entry)); - - if (!category) { - NS_WARNING("Category entry not an nsISupportsCString!"); - - continue; - } - - rv = category->GetData(categoryEntry); - NS_ENSURE_SUCCESS(rv, rv); - - rv = aCategoryManager->GetCategoryEntry(aCategory, categoryEntry.get(), - getter_Copies(contractId)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCID cid; - - rv = nsComponentManager::ContractIDToClassID(contractId, &cid); - - if (NS_FAILED(rv)) { - NS_WARNING("Bad contract id registed with the script namespace manager"); - - continue; - } - - if (aType == nsGlobalNameStruct::eTypeExternalConstructor) { - nsXPIDLCString constructorProto; - rv = aCategoryManager->GetCategoryEntry(JAVASCRIPT_GLOBAL_CONSTRUCTOR_PROTO_ALIAS_CATEGORY, - categoryEntry.get(), - getter_Copies(constructorProto)); - if (NS_SUCCEEDED(rv)) { - nsGlobalNameStruct *s = AddToHash(categoryEntry.get()); - NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - - if (s->mType == nsGlobalNameStruct::eTypeNotInitialized) { - s->mAlias = new nsGlobalNameStruct::ConstructorAlias; - if (!s->mAlias) { - // Free entry - NS_ConvertASCIItoUCS2 key(categoryEntry); - PL_DHashTableOperate(&mGlobalNames, - &key, - PL_DHASH_REMOVE); - return NS_ERROR_OUT_OF_MEMORY; - } - s->mType = nsGlobalNameStruct::eTypeExternalConstructorAlias; - s->mAlias->mCID = cid; - AppendASCIItoUTF16(constructorProto, s->mAlias->mProtoName); - s->mAlias->mProto = nsnull; - } else { - NS_WARNING("Global script name not overwritten!"); - } - - continue; - } - } - - nsGlobalNameStruct *s = AddToHash(categoryEntry.get()); - NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - - if (s->mType == nsGlobalNameStruct::eTypeNotInitialized) { - s->mType = aType; - s->mCID = cid; - } else { - NS_WARNING("Global script name not overwritten!"); - } - } - - return NS_OK; -} - - -// This method enumerates over all installed interfaces (in .xpt -// files) and finds ones that start with "nsIDOM" and has constants -// defined in the interface itself (inherited constants doesn't -// count), once such an interface is found the "nsIDOM" prefix is cut -// off the name and the rest of the name is added into the hash for -// global names. This makes things like 'Node.ELEMENT_NODE' work in -// JS. See nsWindowSH::GlobalResolve() for detais on how this is used. - -nsresult -nsScriptNameSpaceManager::FillHashWithDOMInterfaces() -{ - nsCOMPtr iim = - dont_AddRef(XPTI_GetInterfaceInfoManager()); - NS_ENSURE_TRUE(iim, NS_ERROR_UNEXPECTED); - - // First look for all interfaces whose name starts with nsIDOM - nsCOMPtr domInterfaces; - nsresult rv = - iim->EnumerateInterfacesWhoseNamesStartWith(NS_DOM_INTERFACE_PREFIX, - getter_AddRefs(domInterfaces)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr entry; - - rv = domInterfaces->First(); - - if (NS_FAILED(rv)) { - // Empty interface list? - - NS_WARNING("What, no nsIDOM interfaces installed?"); - - return NS_OK; - } - - PRBool found_old; - nsCOMPtr if_info; - nsXPIDLCString if_name; - const nsIID *iid; - - for ( ; domInterfaces->IsDone() == NS_ENUMERATOR_FALSE; domInterfaces->Next()) { - rv = domInterfaces->CurrentItem(getter_AddRefs(entry)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr if_info(do_QueryInterface(entry)); - if_info->GetName(getter_Copies(if_name)); - if_info->GetIIDShared(&iid); - rv = RegisterInterface(if_name.get() + sizeof(NS_DOM_INTERFACE_PREFIX) - 1, - iid, &found_old); - -#ifdef DEBUG - NS_ASSERTION(!found_old, - "Whaaa, interface name already in hash!"); -#endif - } - - // Next, look for externally registered DOM interfaces - rv = RegisterExternalInterfaces(PR_FALSE); - - return rv; -} - -nsresult -nsScriptNameSpaceManager::RegisterExternalInterfaces(PRBool aAsProto) -{ - nsresult rv; - nsCOMPtr cm = - do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr iim = - dont_AddRef(XPTI_GetInterfaceInfoManager()); - NS_ENSURE_TRUE(iim, NS_ERROR_NOT_AVAILABLE); - - nsCOMPtr enumerator; - rv = cm->EnumerateCategory(JAVASCRIPT_DOM_INTERFACE, - getter_AddRefs(enumerator)); - NS_ENSURE_SUCCESS(rv, rv); - - nsXPIDLCString IID_string; - nsCAutoString category_entry; - const char* if_name; - nsCOMPtr entry; - nsCOMPtr if_info; - PRBool found_old, dom_prefix; - - while (NS_SUCCEEDED(enumerator->GetNext(getter_AddRefs(entry)))) { - nsCOMPtr category(do_QueryInterface(entry)); - - if (!category) { - NS_WARNING("Category entry not an nsISupportsCString!"); - - continue; - } - - rv = category->GetData(category_entry); - NS_ENSURE_SUCCESS(rv, rv); - - rv = cm->GetCategoryEntry(JAVASCRIPT_DOM_INTERFACE, category_entry.get(), - getter_Copies(IID_string)); - NS_ENSURE_SUCCESS(rv, rv); - - nsIID primary_IID; - if (!primary_IID.Parse(IID_string) || - primary_IID.Equals(NS_GET_IID(nsISupports))) { - NS_ERROR("Invalid IID registered with the script namespace manager!"); - continue; - } - - iim->GetInfoForIID(&primary_IID, getter_AddRefs(if_info)); - - while (if_info) { - const nsIID *iid; - if_info->GetIIDShared(&iid); - NS_ENSURE_TRUE(iid, NS_ERROR_UNEXPECTED); - - if (iid->Equals(NS_GET_IID(nsISupports))) { - break; - } - - if_info->GetNameShared(&if_name); - dom_prefix = (strncmp(if_name, NS_DOM_INTERFACE_PREFIX, - sizeof(NS_DOM_INTERFACE_PREFIX) - 1) == 0); - - const char* name; - if (dom_prefix) { - if (!aAsProto) { - // nsIDOM* interfaces have already been registered. - break; - } - name = if_name + sizeof(NS_DOM_INTERFACE_PREFIX) - 1; - } else { - name = if_name + sizeof(NS_INTERFACE_PREFIX) - 1; - } - - if (aAsProto) { - RegisterClassProto(name, iid, &found_old); - } else { - RegisterInterface(name, iid, &found_old); - } - - if (found_old) { - break; - } - - nsCOMPtr tmp(if_info); - tmp->GetParent(getter_AddRefs(if_info)); - } - } - - return NS_OK; -} - -nsresult -nsScriptNameSpaceManager::RegisterInterface(const char* aIfName, - const nsIID *aIfIID, - PRBool* aFoundOld) -{ - *aFoundOld = PR_FALSE; - - nsGlobalNameStruct *s = AddToHash(aIfName); - NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - - if (s->mType != nsGlobalNameStruct::eTypeNotInitialized) { - *aFoundOld = PR_TRUE; - - return NS_OK; - } - - s->mType = nsGlobalNameStruct::eTypeInterface; - s->mIID = *aIfIID; - - return NS_OK; -} - -nsresult -nsScriptNameSpaceManager::Init() -{ - static PLDHashTableOps hash_table_ops = - { - PL_DHashAllocTable, - PL_DHashFreeTable, - GlobalNameHashGetKey, - GlobalNameHashHashKey, - GlobalNameHashMatchEntry, - PL_DHashMoveEntryStub, - GlobalNameHashClearEntry, - PL_DHashFinalizeStub, - GlobalNameHashInitEntry - }; - - mIsInitialized = PL_DHashTableInit(&mGlobalNames, &hash_table_ops, nsnull, - sizeof(GlobalNameMapEntry), 128); - NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_OUT_OF_MEMORY); - - nsresult rv = NS_OK; - - rv = FillHashWithDOMInterfaces(); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr cm = - do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); - NS_ENSURE_SUCCESS(rv, rv); - - rv = FillHash(cm, JAVASCRIPT_GLOBAL_CONSTRUCTOR_CATEGORY, - nsGlobalNameStruct::eTypeExternalConstructor); - NS_ENSURE_SUCCESS(rv, rv); - - rv = FillHash(cm, JAVASCRIPT_GLOBAL_PROPERTY_CATEGORY, - nsGlobalNameStruct::eTypeProperty); - NS_ENSURE_SUCCESS(rv, rv); - - rv = FillHash(cm, JAVASCRIPT_GLOBAL_STATIC_NAMESET_CATEGORY, - nsGlobalNameStruct::eTypeStaticNameSet); - NS_ENSURE_SUCCESS(rv, rv); - - rv = FillHash(cm, JAVASCRIPT_GLOBAL_DYNAMIC_NAMESET_CATEGORY, - nsGlobalNameStruct::eTypeDynamicNameSet); - NS_ENSURE_SUCCESS(rv, rv); - - return NS_OK; -} - -PR_STATIC_CALLBACK(PLDHashOperator) -NameSetInitCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, - PRUint32 number, void *arg) -{ - GlobalNameMapEntry *entry = NS_STATIC_CAST(GlobalNameMapEntry *, hdr); - - if (entry->mGlobalName.mType == nsGlobalNameStruct::eTypeStaticNameSet) { - nsresult rv = NS_OK; - nsCOMPtr ns = - do_CreateInstance(entry->mGlobalName.mCID, &rv); - NS_ENSURE_SUCCESS(rv, PL_DHASH_NEXT); - - rv = ns->InitializeNameSet(NS_STATIC_CAST(nsIScriptContext *, arg)); - NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), - "Initing external script classes failed!"); - } - - return PL_DHASH_NEXT; -} - -nsresult -nsScriptNameSpaceManager::InitForContext(nsIScriptContext *aContext) -{ - PL_DHashTableEnumerate(&mGlobalNames, NameSetInitCallback, aContext); - - return NS_OK; -} - -nsresult -nsScriptNameSpaceManager::LookupName(const nsAString& aName, - const nsGlobalNameStruct **aNameStruct, - const PRUnichar **aClassName) -{ - GlobalNameMapEntry *entry = - NS_STATIC_CAST(GlobalNameMapEntry *, - PL_DHashTableOperate(&mGlobalNames, &aName, - PL_DHASH_LOOKUP)); - - if (PL_DHASH_ENTRY_IS_BUSY(entry)) { - *aNameStruct = &entry->mGlobalName; - if (aClassName) { - *aClassName = entry->mKey.get(); - } - } else { - *aNameStruct = nsnull; - if (aClassName) { - *aClassName = nsnull; - } - } - - return NS_OK; -} - -nsresult -nsScriptNameSpaceManager::RegisterClassName(const char *aClassName, - PRInt32 aDOMClassInfoID) -{ - if (!nsCRT::IsAscii(aClassName)) { - NS_ERROR("Trying to register a non-ASCII class name"); - return NS_OK; - } - nsGlobalNameStruct *s = AddToHash(aClassName); - NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - - if (s->mType == nsGlobalNameStruct::eTypeClassConstructor) { - return NS_OK; - } - - // If a external constructor is already defined with aClassName we - // won't overwrite it. - - if (s->mType == nsGlobalNameStruct::eTypeExternalConstructor) { - return NS_OK; - } - - NS_ASSERTION(s->mType == nsGlobalNameStruct::eTypeNotInitialized || - s->mType == nsGlobalNameStruct::eTypeInterface, - "Whaaa, JS environment name clash!"); - - s->mType = nsGlobalNameStruct::eTypeClassConstructor; - s->mDOMClassInfoID = aDOMClassInfoID; - - return NS_OK; -} - -nsresult -nsScriptNameSpaceManager::RegisterClassProto(const char *aClassName, - const nsIID *aConstructorProtoIID, - PRBool *aFoundOld) -{ - NS_ENSURE_ARG_POINTER(aConstructorProtoIID); - - *aFoundOld = PR_FALSE; - - nsGlobalNameStruct *s = AddToHash(aClassName); - NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - - if (s->mType != nsGlobalNameStruct::eTypeNotInitialized && - s->mType != nsGlobalNameStruct::eTypeInterface) { - *aFoundOld = PR_TRUE; - - return NS_OK; - } - - s->mType = nsGlobalNameStruct::eTypeClassProto; - s->mIID = *aConstructorProtoIID; - - return NS_OK; -} - -nsresult -nsScriptNameSpaceManager::RegisterExternalClassName(const char *aClassName, - nsCID& aCID) -{ - nsGlobalNameStruct *s = AddToHash(aClassName); - NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - - // If an external constructor is already defined with aClassName we - // won't overwrite it. - - if (s->mType == nsGlobalNameStruct::eTypeExternalConstructor) { - return NS_OK; - } - - NS_ASSERTION(s->mType == nsGlobalNameStruct::eTypeNotInitialized || - s->mType == nsGlobalNameStruct::eTypeInterface, - "Whaaa, JS environment name clash!"); - - s->mType = nsGlobalNameStruct::eTypeExternalClassInfoCreator; - s->mCID = aCID; - - return NS_OK; -} - -nsresult -nsScriptNameSpaceManager::RegisterDOMCIData(const char *aName, - nsDOMClassInfoExternalConstructorFnc aConstructorFptr, - const nsIID *aProtoChainInterface, - const nsIID **aInterfaces, - PRUint32 aScriptableFlags, - PRBool aHasClassInterface, - const nsCID *aConstructorCID) -{ - nsGlobalNameStruct *s = AddToHash(aName); - NS_ENSURE_TRUE(s, NS_ERROR_OUT_OF_MEMORY); - - // If an external constructor is already defined with aClassName we - // won't overwrite it. - - if (s->mType == nsGlobalNameStruct::eTypeClassConstructor || - s->mType == nsGlobalNameStruct::eTypeExternalClassInfo) { - return NS_OK; - } - - // XXX Should we bail out here? - NS_ASSERTION(s->mType == nsGlobalNameStruct::eTypeNotInitialized || - s->mType == nsGlobalNameStruct::eTypeExternalClassInfoCreator, - "Someone tries to register classinfo data for a class that isn't new or external!"); - - s->mData = new nsExternalDOMClassInfoData; - NS_ENSURE_TRUE(s->mData, NS_ERROR_OUT_OF_MEMORY); - - s->mType = nsGlobalNameStruct::eTypeExternalClassInfo; - s->mData->mName = aName; - if (aConstructorFptr) - s->mData->u.mExternalConstructorFptr = aConstructorFptr; - else - // null constructor will cause us to use nsDOMGenericSH::doCreate - s->mData->u.mExternalConstructorFptr = nsnull; - s->mData->mCachedClassInfo = nsnull; - s->mData->mProtoChainInterface = aProtoChainInterface; - s->mData->mInterfaces = aInterfaces; - s->mData->mScriptableFlags = aScriptableFlags; - s->mData->mHasClassInterface = aHasClassInterface; - s->mData->mConstructorCID = aConstructorCID; - - return NS_OK; -} diff --git a/mozilla/dom/src/build/nsScriptNameSpaceManager.h b/mozilla/dom/src/build/nsScriptNameSpaceManager.h deleted file mode 100644 index afcd07eff27..00000000000 --- a/mozilla/dom/src/build/nsScriptNameSpaceManager.h +++ /dev/null @@ -1,151 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is Netscape Communications - * Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 2000 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink - * use in OS2 - */ - -#ifndef nsScriptNameSpaceManager_h__ -#define nsScriptNameSpaceManager_h__ - -#include "nsIScriptNameSpaceManager.h" -#include "nsString.h" -#include "nsID.h" -#include "pldhash.h" - -#include "nsDOMClassInfo.h" - -struct nsGlobalNameStruct -{ - struct ConstructorAlias - { - nsCID mCID; - nsString mProtoName; - nsGlobalNameStruct* mProto; - }; - - enum nametype { - eTypeNotInitialized, - eTypeInterface, - eTypeProperty, - eTypeExternalConstructor, - eTypeStaticNameSet, - eTypeDynamicNameSet, - eTypeClassConstructor, - eTypeClassProto, - eTypeExternalClassInfoCreator, - eTypeExternalClassInfo, - eTypeExternalConstructorAlias - } mType; - - union { - PRInt32 mDOMClassInfoID; // eTypeClassConstructor - nsIID mIID; // eTypeInterface, eTypeClassProto - nsExternalDOMClassInfoData* mData; // eTypeExternalClassInfo - ConstructorAlias* mAlias; // eTypeExternalConstructorAlias - nsCID mCID; // All other types... - }; - -private: - - // copy constructor -}; - - -class nsIScriptContext; -class nsICategoryManager; - - -class nsScriptNameSpaceManager -{ -public: - nsScriptNameSpaceManager(); - virtual ~nsScriptNameSpaceManager(); - - nsresult Init(); - nsresult InitForContext(nsIScriptContext *aContext); - - // Returns a nsGlobalNameStruct for aName, or null if one is not - // found. The returned nsGlobalNameStruct is only guaranteed to be - // valid until the next call to any of the methods in this class. - // It also returns a pointer to the string buffer of the classname - // in the nsGlobalNameStruct. - nsresult LookupName(const nsAString& aName, - const nsGlobalNameStruct **aNameStruct, - const PRUnichar **aClassName = nsnull); - - nsresult RegisterClassName(const char *aClassName, - PRInt32 aDOMClassInfoID); - - nsresult RegisterClassProto(const char *aClassName, - const nsIID *aConstructorProtoIID, - PRBool *aFoundOld); - - nsresult RegisterExternalInterfaces(PRBool aAsProto); - - nsresult RegisterExternalClassName(const char *aClassName, - nsCID& aCID); - - // Register the info for an external class. aName must be static - // data, it will not be deleted by the DOM code. - nsresult RegisterDOMCIData(const char *aName, - nsDOMClassInfoExternalConstructorFnc aConstructorFptr, - const nsIID *aProtoChainInterface, - const nsIID **aInterfaces, - PRUint32 aScriptableFlags, - PRBool aHasClassInterface, - const nsCID *aConstructorCID); - - nsGlobalNameStruct* GetConstructorProto(const nsGlobalNameStruct* aStruct); - -protected: - // Adds a new entry to the hash and returns the nsGlobalNameStruct - // that aKey will be mapped to. If mType in the returned - // nsGlobalNameStruct is != eTypeNotInitialized, an entry for aKey - // already existed. - nsGlobalNameStruct *AddToHash(const char *aKey); - - nsresult FillHash(nsICategoryManager *aCategoryManager, - const char *aCategory, - nsGlobalNameStruct::nametype aType); - nsresult FillHashWithDOMInterfaces(); - nsresult RegisterInterface(const char* aIfName, - const nsIID *aIfIID, - PRBool* aFoundOld); - - // Inline PLDHashTable, init with PL_DHashTableInit() and delete - // with PL_DHashTableFinish(). - PLDHashTable mGlobalNames; - - PRPackedBool mIsInitialized; -}; - -#endif /* nsScriptNameSpaceManager_h__ */ diff --git a/mozilla/dom/src/build/win32.order b/mozilla/dom/src/build/win32.order deleted file mode 100644 index 382a6afb38a..00000000000 --- a/mozilla/dom/src/build/win32.order +++ /dev/null @@ -1,433 +0,0 @@ -?AddRef@GlobalWindowImpl@@UAGKXZ ; 891084 -?Release@GlobalWindowImpl@@UAGKXZ ; 890271 -?QueryInterface@GlobalWindowImpl@@UAGIABUnsID@@PAPAX@Z ; 451524 -?HasMutationListeners@GlobalWindowImpl@@UAGIIPAH@Z ; 258127 -?AddRef@nsJSContext@@UAGKXZ ; 145570 -?Release@nsJSContext@@UAGKXZ ; 145553 -?nsGenericResolve@nsJSUtils@@SAHPAUJSContext@@PAUJSObject@@JPAUJSPropertySpec@@@Z ; 116236 -?nsGetNativeThis@nsJSUtils@@SAPAVnsISupports@@PAUJSContext@@PAUJSObject@@@Z ; 81791 -?GetPrincipal@GlobalWindowImpl@@UAGIPAPAVnsIPrincipal@@@Z ; 76824 -?HandleDOMEvent@GlobalWindowImpl@@UAGIPAVnsIPresContext@@PAUnsEvent@@PAPAVnsIDOMEvent@@IPAW4nsEventStatus@@@Z ; 71176 -?nsGetSecurityManager@nsJSUtils@@SAPAVnsIScriptSecurityManager@@PAUJSContext@@PAUJSObject@@@Z ; 68879 -?GetContext@GlobalWindowImpl@@UAGIPAPAVnsIScriptContext@@@Z ; 59633 -?nsGetStaticScriptContext@nsJSUtils@@SAIPAUJSContext@@PAUJSObject@@PAPAVnsIScriptContext@@@Z ; 48874 -?nsGetStaticScriptGlobal@nsJSUtils@@SAIPAUJSContext@@PAUJSObject@@PAPAVnsIScriptGlobalObject@@@Z ; 48874 -?AddRef@nsJSEnvironment@@UAGKXZ ; 41620 -?Release@nsWindowRoot@@UAGKXZ ; 40376 -?HandleChromeEvent@nsWindowRoot@@UAGIPAVnsIPresContext@@PAUnsEvent@@PAPAVnsIDOMEvent@@IPAW4nsEventStatus@@@Z ; 38868 -?nsConvertObjectToJSVal@nsJSUtils@@SAXPAVnsISupports@@PAUJSContext@@PAUJSObject@@PAJ@Z ; 35660 -?nsCallJSScriptObjectGetProperty@nsJSUtils@@SAHPAVnsISupports@@PAUJSContext@@PAUJSObject@@JPAJ@Z ; 24937 -?nsConvertJSValToString@nsJSUtils@@SAXAAVnsAString@@PAUJSContext@@J@Z ; 24417 -?assign_assuming_AddRef@nsCOMPtr_base@@IAEXPAVnsISupports@@@Z ; 22937 -?GetNativeContext@nsJSContext@@UAGPAXXZ ; 22423 -?AddRef@nsScriptNameSpaceManager@@UAGKXZ ; 17611 -?ScriptEvaluated@nsJSContext@@UAGIH@Z ; 15183 -?nsGlobalResolve@nsJSUtils@@SAHPAUJSContext@@PAUJSObject@@JPAUJSPropertySpec@@@Z ; 13635 -?Resolve@GlobalWindowImpl@@UAEHPAUJSContext@@PAUJSObject@@JPAH@Z ; 13635 -?DOMBranchCallback@nsJSContext@@CAHPAUJSContext@@PAUJSScript@@@Z ; 13138 -?QueryInterface@nsJSContext@@UAGIABUnsID@@PAPAX@Z ; 13118 -?QueryInterface@nsJSEventListener@@UAGIABUnsID@@PAPAX@Z ; 12919 -?IsContextInitialized@nsJSContext@@UAGIXZ ; 12140 -?AddRef@nsJSEventListener@@UAGKXZ ; 11437 -?Equals@nsID@@QBEHABU1@@Z ; 10969 -?GetScriptObject@GlobalWindowImpl@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 10819 -?GetGlobalObject@nsJSContext@@UAGPAVnsIScriptGlobalObject@@XZ ; 10761 -?GetDocument@GlobalWindowImpl@@UAGIPAPAVnsIDOMDocumentView@@@Z ; 10518 -?Release@nsScriptNameSpaceManager@@UAGKXZ ; 10059 -?GetNameSpaceManager@nsJSContext@@UAGIPAPAVnsIScriptNameSpaceManager@@@Z ; 10036 -?LookupName@nsScriptNameSpaceManager@@UAGIABVnsAString@@AAHAAUnsID@@2@Z ; 9944 -?nsGenericFinalize@nsJSUtils@@SAXPAUJSContext@@PAUJSObject@@@Z ; 9026 -?Release@nsJSEventListener@@UAGKXZ ; 8831 -??0?$nsCOMPtr@VnsISupports@@@@QAE@PAVnsISupports@@@Z ; 6553 -?nsConvertStringToJSVal@nsJSUtils@@SAXABVnsString@@PAUJSContext@@PAJ@Z ; 5994 -?GetTop@GlobalWindowImpl@@UAGIPAPAVnsIDOMWindow@@@Z ; 5673 -?Release@nsDOMScriptObjectFactory@@UAGKXZ ; 5446 -?QueryInterface@nsDOMScriptObjectFactory@@UAGIABUnsID@@PAPAX@Z ; 5003 -NS_NewJSEventListener ; 4252 -??0nsJSEventListener@@QAE@PAVnsIScriptContext@@PAVnsIScriptObjectOwner@@@Z ; 4252 -??1nsJSEventListener@@UAE@XZ ; 4222 -??_GnsJSEventListener@@UAEPAXI@Z ; 4222 -?nsConvertXPCObjectToJSVal@nsJSUtils@@SAXPAVnsISupports@@ABUnsID@@PAUJSContext@@PAUJSObject@@PAJ@Z ; 3890 -?GetControllerForCommand@nsFocusController@@UAGIABVnsAString@@PAPAVnsIController@@@Z ; 3632 -?GetControllers@nsFocusController@@UAGIPAPAVnsIControllers@@@Z ; 3632 -NS_InitNodeListClass ; 3629 -?NewScriptNodeList@nsDOMScriptObjectFactory@@UAGIPAVnsIScriptContext@@PAVnsISupports@@1PAPAX@Z ; 3493 -NS_NewScriptNodeList ; 3493 -?GetControllers@GlobalWindowImpl@@UAGIPAPAVnsIControllers@@@Z ; 3222 -?GetSecurityManager@nsJSContext@@UAGIPAPAVnsIScriptSecurityManager@@@Z ; 2525 -?GetDocShell@GlobalWindowImpl@@UAGIPAPAVnsIDocShell@@@Z ; 2336 -?AddNamedReference@nsJSContext@@UAGIPAX0PBD@Z ; 2183 -?RemoveReference@nsJSContext@@UAGIPAX0@Z ; 2104 -?DropTimeout@GlobalWindowImpl@@IAEXPAUnsTimeoutImpl@@PAVnsIScriptContext@@@Z ; 1989 -?Release@nsDOMWindowController@@UAGKXZ ; 1936 -?GetWindow@GlobalWindowImpl@@UAGIPAPAVnsIDOMWindowInternal@@@Z ; 1683 -?GetFocusController@nsWindowRoot@@UAGIPAPAVnsIFocusController@@@Z ; 1606 -?NewScriptXULElement@nsDOMScriptObjectFactory@@UAGIABVnsString@@PAVnsIScriptContext@@PAVnsISupports@@2PAPAX@Z ; 1536 -NS_InitXULElementClass ; 1534 -NS_NewScriptXULElement ; 1531 -?CallEventHandler@nsJSContext@@UAGIPAX0I0PAHH@Z ; 1526 -NS_InitKeyEventClass ; 1458 -?QueryInterface@nsWindowRoot@@UAGIABUnsID@@PAPAX@Z ; 1416 -NS_NewScriptKeyEvent ; 1322 -?Release@nsFocusController@@UAGKXZ ; 1313 -?HoldTimeout@GlobalWindowImpl@@IAEXPAUnsTimeoutImpl@@@Z ; 1291 -?Release@LocationImpl@@UAGKXZ ; 1233 -?nsCallJSScriptObjectSetProperty@nsJSUtils@@SAHPAVnsISupports@@PAUJSContext@@PAUJSObject@@JPAJ@Z ; 1111 -?QueryInterface@LocationImpl@@UAGIABUnsID@@PAPAX@Z ; 1110 -?GetParentWindowFromDocument@nsFocusController@@SAIPAVnsIDOMDocument@@PAPAVnsIDOMWindowInternal@@@Z ; 1078 -?HandleEvent@nsJSEventListener@@UAEIPAVnsIDOMEvent@@@Z ; 1066 -?GetFocusedElement@nsFocusController@@UAGIPAPAVnsIDOMElement@@@Z ; 1029 -?SupportsCommand@nsDOMWindowController@@UAGIPBGPAH@Z ; 1014 -?QueryInterface@NavigatorImpl@@UAGIABUnsID@@PAPAX@Z ; 951 -?GetTreeOwner@GlobalWindowImpl@@MAGIPAPAVnsIDocShellTreeOwner@@@Z ; 854 -?AtomToEventHandlerName@@YAXPAVnsIAtom@@PADI@Z ; 805 -?Release@PluginArrayImpl@@UAGKXZ ; 787 -?Unescape@GlobalWindowImpl@@UAGIABVnsAString@@AAV2@@Z ; 768 -?EvaluateString@nsJSContext@@UAGIABVnsAString@@PAXPAVnsIPrincipal@@PBDI3AAV2@PAH@Z ; 763 -?GetParent@GlobalWindowImpl@@UAGIPAPAVnsIDOMWindow@@@Z ; 749 -?GetPrivateParent@GlobalWindowImpl@@UAGIPAPAVnsPIDOMWindow@@@Z ; 740 -?CompileFunction@nsJSContext@@UAGIPAXABVnsCString@@IPAPBDABVnsAString@@PBDIHPAPAX@Z ; 720 -?GetPrivateRoot@GlobalWindowImpl@@UAGIPAPAVnsIDOMWindowInternal@@@Z ; 707 -?do_GetService@@YA?BVnsGetServiceByContractID@@PBDPAI@Z ; 707 -?Get_content@GlobalWindowImpl@@UAGIPAPAVnsIDOMWindowInternal@@@Z ; 707 -?QueryInterface@nsJSDOMEventListener@@UAGIABUnsID@@PAPAX@Z ; 702 -?SetTimeoutOrInterval@GlobalWindowImpl@@MAGIPAUJSContext@@PAJIPAHH@Z ; 698 -?nsGetCallingLocation@nsJSUtils@@SAHPAUJSContext@@PAPBDPAI@Z ; 698 -?InsertTimeoutIntoList@GlobalWindowImpl@@IAEXPAPAUnsTimeoutImpl@@PAU2@@Z ; 698 -?SetTimeout@GlobalWindowImpl@@UAGIPAUJSContext@@PAJIPAH@Z ; 698 -?QueryInterface@nsDOMWindowList@@UAGIABUnsID@@PAPAX@Z ; 686 -NS_InitNodeClass ; 657 -?do_GetService@@YA?BVnsGetServiceByCID@@ABUnsID@@PAI@Z ; 655 -?QueryInterface@nsDOMWindowController@@UAGIABUnsID@@PAPAX@Z ; 632 -?RunTimeout@GlobalWindowImpl@@IAEHPAUnsTimeoutImpl@@@Z ; 593 -?nsGlobalWindow_RunTimeout@@YAXPAVnsITimer@@PAX@Z ; 593 -?nsConvertJSValToObject@nsJSUtils@@SAHPAPAVnsISupports@@ABUnsID@@ABVnsString@@PAUJSContext@@J@Z ; 571 -?SetSuppressFocus@nsFocusController@@UAGIH@Z ; 552 -?CompileEventHandler@nsJSContext@@UAGIPAXPAVnsIAtom@@ABVnsAString@@HPAPAX@Z ; 462 -?GetChromeEventHandler@GlobalWindowImpl@@UAGIPAPAVnsIChromeEventHandler@@@Z ; 439 -?GetRootFocusController@GlobalWindowImpl@@UAGIPAPAVnsIFocusController@@@Z ; 439 -?Release@nsDOMWindowList@@UAGKXZ ; 438 -?SetFocusedWindow@nsFocusController@@UAGIPAVnsIDOMWindowInternal@@@Z ; 430 -?QueryInterface@nsFocusController@@UAGIABUnsID@@PAPAX@Z ; 424 -?nsGetDynamicScriptContext@nsJSUtils@@SAIPAUJSContext@@PAPAVnsIScriptContext@@@Z ; 411 -?GetScriptsEnabled@nsJSContext@@UAGIPAH@Z ; 381 -?NS_DOMTagToEnum@@YA?AW4nsDOMHTMLTag@@PBD@Z ; 373 -?NewScriptElement@nsDOMScriptObjectFactory@@UAGIABVnsString@@PAVnsIScriptContext@@PAVnsISupports@@2PAPAX@Z ; 373 -NS_InitHTMLElementClass ; 347 -?BindCompiledEventHandler@nsJSContext@@UAGIPAXPAVnsIAtom@@0@Z ; 343 -?GetScriptObject@LocationImpl@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 312 -?GetLocation@GlobalWindowImpl@@UAGIPAJ@Z ; 312 -?GetLocation@GlobalWindowImpl@@UAGIPAPAVnsIDOMLocation@@@Z ; 312 -?GetObjectProperty@GlobalWindowImpl@@UAGIPBGPAPAVnsISupports@@@Z ; 307 -?nsConvertJSValToXPCObject@nsJSUtils@@SAHPAPAVnsISupports@@ABUnsID@@PAUJSContext@@J@Z ; 307 -?GetHref@LocationImpl@@UAGIAAVnsAString@@@Z ; 302 -NS_InitElementClass ; 277 -?GetEditInterface@nsDOMWindowController@@AAEIPAPAVnsIContentViewerEdit@@@Z ; 274 -?IsCommandEnabled@nsDOMWindowController@@UAGIPBGPAH@Z ; 274 -?Focus@nsFocusController@@UAEIPAVnsIDOMEvent@@@Z ; 261 -?HandleEvent@nsJSDOMEventListener@@UAEIPAVnsIDOMEvent@@@Z ; 256 -?GetProperty@LocationImpl@@UAEHPAUJSContext@@PAUJSObject@@JPAJ@Z ; 250 -?ExecuteScript@nsJSContext@@UAGIPAX0PAVnsAString@@PAH@Z ; 232 -?SetNewDocument@GlobalWindowImpl@@UAGIPAVnsIDOMDocument@@@Z ; 230 -?UpdateCommands@GlobalWindowImpl@@UAGIABVnsAString@@@Z ; 226 -NS_InitDocumentClass ; 214 -?RegisterGlobalName@nsScriptNameSpaceManager@@UAGIABVnsAString@@ABUnsID@@1H@Z ; 207 -?Resolve@LocationImpl@@UAEHPAUJSContext@@PAUJSObject@@JPAH@Z ; 181 -?GetScriptObject@NavigatorImpl@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 173 -?GetLength@nsDOMWindowList@@UAGIPAI@Z ; 172 -?GetComputedStyle@GlobalWindowImpl@@UAGIPAVnsIDOMElement@@ABVnsAString@@PAPAVnsIDOMCSSStyleDeclaration@@@Z ; 172 -NS_InitTextClass ; 169 -?GetNavigator@GlobalWindowImpl@@UAGIPAPAVnsIDOMNavigator@@@Z ; 169 -?Release@nsScriptNameSetRegistry@@UAGKXZ ; 166 -?QueryInterface@nsScriptNameSetRegistry@@UAGIABUnsID@@PAPAX@Z ; 164 -?RemoveNames@nsScriptNameSpaceManager@@KAHPAUPLHashEntry@@HPAX@Z ; 161 -?GetScriptObject@nsDOMWindowList@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 156 -?GetFrames@GlobalWindowImpl@@UAGIPAPAVnsIDOMWindowCollection@@@Z ; 156 -?ClearAllTimeouts@GlobalWindowImpl@@IAEXXZ ; 149 -?GetWebBrowserChrome@GlobalWindowImpl@@MAGIPAPAVnsIWebBrowserChrome@@@Z ; 147 -NS_InitHTMLImageElementClass ; 139 -NS_InitHTMLOptionElementClass ; 137 -?InitializeClasses@nsScriptNameSetRegistry@@UAGIPAVnsIScriptContext@@@Z ; 136 -?InitializeExternalClasses@nsJSContext@@QAEIXZ ; 136 -?Blur@nsFocusController@@UAEIPAVnsIDOMEvent@@@Z ; 136 -NS_InitAttrClass ; 136 -?NS_InitWindowClass@@YAIPAVnsIScriptContext@@PAVnsIScriptGlobalObject@@@Z ; 136 -?InitializeLiveConnectClasses@nsJSContext@@QAEIXZ ; 136 -?InitClasses@nsJSContext@@UAGIXZ ; 136 -?InitContext@nsJSContext@@UAGIPAVnsIScriptGlobalObject@@@Z ; 136 -NS_InitNamedNodeMapClass ; 136 -?QueryInterface@PluginArrayImpl@@UAGIABUnsID@@PAPAX@Z ; 132 -NS_InitUIEventClass ; 130 -NS_InitEventClass ; 130 -NS_InitCharacterDataClass ; 130 -?SetScriptObject@PluginElementImpl@@UAGIPAX@Z ; 127 -?EvaluateStringWithValue@nsJSContext@@UAGIABVnsAString@@PAXPAVnsIPrincipal@@PBDI31PAH@Z ; 125 -?UpdateCommands@nsFocusController@@MAGIABVnsAString@@@Z ; 123 -?GetDeviceContext@ScreenImpl@@IAEPAVnsIDeviceContext@@XZ ; 114 -?ClearTimeoutOrInterval@GlobalWindowImpl@@MAGIH@Z ; 111 -?ClearInterval@GlobalWindowImpl@@UAGIH@Z ; 111 -?GetEventTarget@nsJSEventListener@@UAGIPAPAVnsIScriptContext@@PAPAVnsIScriptObjectOwner@@@Z ; 106 -?CompileScript@nsJSContext@@UAGIPBGHPAXPAVnsIPrincipal@@PBDI3PAPAX@Z ; 104 -?GetListenerManager@GlobalWindowImpl@@UAGIPAPAVnsIEventListenerManager@@@Z ; 97 -?SetScriptObject@nsDOMException@@UAGIPAX@Z ; 96 -?NS_NewURI@@YAIPAPAVnsIURI@@PBDPAV1@PAVnsIIOService@@@Z ; 94 -?do_GetIOService@@YA?BVnsGetServiceByCID@@PAI@Z ; 94 -NS_NewScriptHTMLDocument ; 88 -?SetDocShell@GlobalWindowImpl@@UAGIPAVnsIDocShell@@@Z ; 88 -NS_InitHTMLDocumentClass ; 88 -NS_InitHTMLAnchorElementClass ; 85 -NS_NewScriptHTMLAnchorElement ; 85 -?QueryInterface@PluginElementImpl@@UAGIABUnsID@@PAPAX@Z ; 85 -?GetTreeOwner@GlobalWindowImpl@@MAGIPAPAVnsIBaseWindow@@@Z ; 82 -?Focus@GlobalWindowImpl@@UAGIXZ ; 79 -??0?$nsCOMPtr@VnsIViewManager@@@@QAE@XZ ; 76 -?GetInternals@nsJSDOMEventListener@@UAGIPAPAX0@Z ; 75 -?CheckIfEqual@nsJSDOMEventListener@@UAGIPAVnsIScriptEventListener@@PAH@Z ; 75 -?SetDefaultStatus@GlobalWindowImpl@@UAGIABVnsAString@@@Z ; 74 -?GC@nsJSContext@@UAGIXZ ; 73 -?SetStatus@GlobalWindowImpl@@UAGIABVnsAString@@@Z ; 73 -?GetAppName@NavigatorImpl@@UAGIAAVnsAString@@@Z ; 72 -?GetSuppressFocus@nsFocusController@@UAGIPAH@Z ; 70 -?nsConvertJSValToBool@nsJSUtils@@SAHPAHPAUJSContext@@J@Z ; 65 -?QueryInterface@ScreenImpl@@UAGIABUnsID@@PAPAX@Z ; 64 -??0nsJSContext@@QAE@PAUJSRuntime@@@Z ; 63 -NS_CreateScriptContext ; 63 -??0nsJSDOMEventListener@@QAE@PAVnsIScriptContext@@PAUJSObject@@1@Z ; 63 -?GetScriptingEnvironment@nsJSEnvironment@@SAPAV1@XZ ; 63 -??1nsJSDOMEventListener@@UAE@XZ ; 63 -?GetNewContext@nsJSEnvironment@@QAEPAVnsIScriptContext@@XZ ; 63 -?nsConvertJSValToFunc@nsJSUtils@@SAHPAPAVnsIDOMEventListener@@PAUJSContext@@PAUJSObject@@J@Z ; 63 -??_EnsJSDOMEventListener@@UAEPAXI@Z ; 63 -NS_NewScriptEventListener ; 63 -?JSOptionChangedCallback@nsJSContext@@CAHPBDPAX@Z ; 63 -NS_NewScriptWindowCollection ; 62 -NS_InitWindowCollectionClass ; 62 -?SetFocusedElement@nsFocusController@@UAGIPAVnsIDOMElement@@@Z ; 62 -?ToString@LocationImpl@@UAGIAAVnsAString@@@Z ; 57 -?SetActive@nsFocusController@@UAGIH@Z ; 52 -?RegisterCompileEventListener@GlobalWindowImpl@@IAEIPBDH@Z ; 51 -?GetSearch@LocationImpl@@UAGIAAVnsAString@@@Z ; 47 -NS_InitHTMLTableCellElementClass ; 46 -NS_NewScriptHTMLTableCellElement ; 46 -??1nsJSContext@@UAE@XZ ; 46 -??_GnsJSContext@@UAEPAXI@Z ; 46 -?AddEventListener@nsWindowRoot@@UAGIABVnsAString@@PAVnsIDOMEventListener@@H@Z ; 45 -?GetListenerManager@nsWindowRoot@@UAGIPAPAVnsIEventListenerManager@@@Z ; 45 -?SetRootedScriptObject@nsJSContext@@UAGIPAX@Z ; 44 -NS_NewScriptGlobalObject ; 44 -?SetContext@GlobalWindowImpl@@UAGIPAVnsIScriptContext@@@Z ; 44 -??0GlobalWindowImpl@@QAE@XZ ; 44 -?SetGlobalObjectOwner@GlobalWindowImpl@@UAGIPAVnsIScriptGlobalObjectOwner@@@Z ; 44 -NS_NewScriptWindow ; 44 -?SetOnload@GlobalWindowImpl@@UAGIJ@Z ; 43 -?nsGetDynamicScriptGlobal@nsJSUtils@@SAIPAUJSContext@@PAPAVnsIScriptGlobalObject@@@Z ; 42 -?SetScriptObject@GlobalWindowImpl@@UAGIPAX@Z ; 42 -?CheckURL@LocationImpl@@IAEIPAVnsIURI@@PAPAVnsIDocShellLoadInfo@@@Z ; 42 -?SetProperty@LocationImpl@@UAEHPAUJSContext@@PAUJSObject@@JPAJ@Z ; 42 -?SetHrefWithBase@LocationImpl@@IAEIABVnsAString@@PAVnsIURI@@H@Z ; 42 -?GetSourceURL@LocationImpl@@IAEIPAUJSContext@@PAPAVnsIURI@@@Z ; 42 -NS_NewScriptHTMLTableRowElement ; 41 -NS_InitHTMLTableRowElementClass ; 41 -?GetUserAgent@NavigatorImpl@@UAGIAAVnsAString@@@Z ; 39 -?GetScreen@GlobalWindowImpl@@UAGIPAPAVnsIDOMScreen@@@Z ; 38 -?Dump@GlobalWindowImpl@@UAGIABVnsAString@@@Z ; 37 -?GetSuppressFocusScroll@nsFocusController@@UAGIPAH@Z ; 36 -NS_NewScriptHTMLDivElement ; 35 -?CleanUp@GlobalWindowImpl@@IAEXXZ ; 35 -NS_InitHTMLDivElementClass ; 35 -?NewScriptCharacterData@nsDOMScriptObjectFactory@@UAGIGPAVnsIScriptContext@@PAVnsISupports@@1PAPAX@Z ; 34 -NS_NewScriptText ; 33 -NS_NewScriptHTMLTableSectionElement ; 32 -??1GlobalWindowImpl@@MAE@XZ ; 32 -NS_InitHTMLTableSectionElementClass ; 32 -NS_NewScriptHTMLTableElement ; 32 -??_GGlobalWindowImpl@@MAEPAXI@Z ; 32 -NS_InitHTMLTableElementClass ; 32 -?Item@nsDOMWindowList@@UAGIIPAPAVnsIDOMWindow@@@Z ; 31 -??0nsGetInterface@@QAE@PAVnsISupports@@PAI@Z ; 31 -?GetWidth@ScreenImpl@@UAGIPAH@Z ; 28 -?GetHeight@ScreenImpl@@UAGIPAH@Z ; 27 -NS_InitNavigatorClass ; 26 -NS_NewScriptNavigator ; 26 -?GetActive@nsFocusController@@UAGIPAH@Z ; 24 -?GetLeft@ScreenImpl@@UAGIPAH@Z ; 24 -?GetTop@ScreenImpl@@UAGIPAH@Z ; 24 -NS_InitHTMLHtmlElementClass ; 23 -??0nsScriptNameSpaceManager@@QAE@XZ ; 23 -?QueryInterface@nsScriptNameSpaceManager@@UAGIABUnsID@@PAPAX@Z ; 23 -NS_NewScriptHTMLHtmlElement ; 23 -NS_NewScriptNameSpaceManager ; 23 -??_EnsScriptNameSpaceManager@@UAEPAXI@Z ; 23 -??1nsScriptNameSpaceManager@@UAE@XZ ; 23 -?PopulateNameSpace@nsScriptNameSetRegistry@@UAGIPAVnsIScriptContext@@@Z ; 23 -?GetAppVersion@NavigatorImpl@@UAGIAAVnsAString@@@Z ; 23 -?AddEventListener@GlobalWindowImpl@@UAGIABVnsAString@@PAVnsIDOMEventListener@@H@Z ; 23 -?GetPlugins@NavigatorImpl@@UAGIPAPAVnsIDOMPluginArray@@@Z ; 22 -?GetScriptObject@PluginArrayImpl@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 21 -?Escape@GlobalWindowImpl@@UAGIABVnsAString@@AAV2@@Z ; 21 -NS_InitHTMLInputElementClass ; 20 -NS_NewScriptHTMLInputElement ; 20 -NS_InitLocationClass ; 20 -NS_NewScriptLocation ; 20 -NS_NewScriptHTMLBodyElement ; 19 -NS_InitHTMLBodyElementClass ; 19 -?SetCursor@GlobalWindowImpl@@UAGIABVnsAString@@@Z ; 16 -?GetLength@PluginArrayImpl@@UAGIPAI@Z ; 15 -?Item@PluginArrayImpl@@UAGIIPAPAVnsIDOMPlugin@@@Z ; 15 -?SetTitle@GlobalWindowImpl@@UAGIABVnsAString@@@Z ; 13 -?GetScriptObject@ScreenImpl@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 12 -?SetDocShell@nsDOMWindowList@@UAGIPAVnsIDocShell@@@Z ; 12 -NS_InitXULDocumentClass ; 11 -NS_NewScriptXULDocument ; 11 -??0nsDOMWindowController@@QAE@PAVnsIDOMWindowInternal@@@Z ; 10 -?GetPlatform@NavigatorImpl@@UAGIAAVnsAString@@@Z ; 10 -?GetScriptObject@PluginElementImpl@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 10 -NS_NewScriptPlugin ; 10 -NS_InitPluginClass ; 10 -??0nsFocusController@@IAE@XZ ; 9 -?GetName@PluginElementImpl@@UAGIAAVnsAString@@@Z ; 9 -?NS_NewWindowRoot@@YAIPAVnsIDOMWindow@@PAPAVnsIChromeEventHandler@@@Z ; 9 -?Create@nsFocusController@@SGIPAPAVnsIFocusController@@@Z ; 9 -??0nsWindowRoot@@QAE@PAVnsIDOMWindow@@@Z ; 9 -?SetDocShell@NavigatorImpl@@QAEXPAVnsIDocShell@@@Z ; 8 -?QueryInterface@MimeTypeElementImpl@@UAGIABUnsID@@PAPAX@Z ; 8 -??0NavigatorImpl@@QAE@PAVnsIDocShell@@@Z ; 8 -?SetName@GlobalWindowImpl@@UAGIABVnsAString@@@Z ; 8 -?OpenInternal@GlobalWindowImpl@@MAGIPAUJSContext@@PAJIHPAPAVnsIDOMWindowInternal@@@Z ; 7 -NS_InitHTMLCollectionClass ; 7 -?QueryInterface@MimeTypeArrayImpl@@UAGIABUnsID@@PAPAX@Z ; 7 -?SetOpenerWindow@GlobalWindowImpl@@UAGIPAVnsIDOMWindowInternal@@@Z ; 7 -??0ScreenImpl@@QAE@PAVnsIDocShell@@@Z ; 6 -??1nsFocusController@@MAE@XZ ; 6 -??0PluginElementImpl@@QAE@PAVnsIDOMPlugin@@@Z ; 6 -?OpenDialog@GlobalWindowImpl@@UAGIPAUJSContext@@PAJIPAPAVnsIDOMWindowInternal@@@Z ; 6 -??_EnsFocusController@@MAEPAXI@Z ; 6 -?GetPrompter@GlobalWindowImpl@@UAGIPAPAVnsIPrompt@@@Z ; 6 -NS_InitHTMLParagraphElementClass ; 6 -?NewScriptHTMLCollection@nsDOMScriptObjectFactory@@UAGIPAVnsIScriptContext@@PAVnsISupports@@1PAPAX@Z ; 6 -?SetDocShell@ScreenImpl@@UAGIPAVnsIDocShell@@@Z ; 6 -NS_NewScriptXULCommandDispatcher ; 6 -?Release@nsJSEnvironment@@UAGKXZ ; 6 -??_EnsWindowRoot@@UAEPAXI@Z ; 6 -NS_NewScriptHTMLCollection ; 6 -NS_InitHTMLFontElementClass ; 6 -NS_NewScriptHTMLParagraphElement ; 6 -NS_InitXULCommandDispatcherClass ; 6 -NS_NewScriptHTMLFontElement ; 6 -??0nsDOMWindowList@@QAE@PAVnsIDocShell@@@Z ; 6 -?GetLength@PluginElementImpl@@UAGIPAI@Z ; 6 -??1nsWindowRoot@@UAE@XZ ; 6 -NS_NewScriptXULTreeElement ; 5 -?AddExternalNameSet@nsScriptNameSetRegistry@@UAGIPAVnsIScriptExternalNameSet@@@Z ; 5 -NS_InitXULTreeElementClass ; 5 -NS_InitHTMLHRElementClass ; 4 -?QueryInterface@nsDOMFactory@@UAGIABUnsID@@PAPAX@Z ; 4 -??0MimeTypeElementImpl@@QAE@PAVnsIDOMPlugin@@PAVnsIDOMMimeType@@@Z ; 4 -NS_NewScriptHTMLHRElement ; 4 -NS_InitScreenClass ; 4 -?Release@nsDOMNativeObjectRegistry@@UAGKXZ ; 4 -?QueryInterface@nsJSEnvironment@@UAGIABUnsID@@PAPAX@Z ; 4 -NS_NewScriptScreen ; 4 -?Item@PluginElementImpl@@UAGIIPAPAVnsIDOMMimeType@@@Z ; 4 -NS_InitPluginArrayClass ; 3 -NS_NewScriptPluginArray ; 3 -NS_NewScriptHTMLImageElement ; 3 -?GetGlobalObjectOwner@GlobalWindowImpl@@UAGIPAPAVnsIScriptGlobalObjectOwner@@@Z ; 3 -?SetDocShell@LocationImpl@@UAGXPAVnsIDocShell@@@Z ; 3 -NS_NewScriptHTMLLIElement ; 3 -?NS_ScriptErrorReporter@@YAXPAUJSContext@@PBDPAUJSErrorReport@@@Z ; 3 -NS_NewScriptHTMLFormElement ; 3 -NS_InitHTMLFormElementClass ; 3 -NS_InitHTMLLIElementClass ; 3 -?JavaEnabled@NavigatorImpl@@UAGIPAH@Z ; 3 -?SetTerminationFunction@nsJSContext@@UAGIP6AXPAVnsISupports@@@Z0@Z ; 3 -??0LocationImpl@@QAE@PAVnsIDocShell@@@Z ; 3 -?Close@GlobalWindowImpl@@UAGIXZ ; 3 -?GetScriptObject@MimeTypeArrayImpl@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 3 -?SetOnerror@GlobalWindowImpl@@UAGIJ@Z ; 3 -?CloseWindow@GlobalWindowImpl@@KAXPAVnsISupports@@@Z ; 3 -?GetColorDepth@ScreenImpl@@UAGIPAH@Z ; 3 -?GetMimeTypes@PluginElementImpl@@AAEIXZ ; 3 -?GetLanguage@NavigatorImpl@@UAGIAAVnsAString@@@Z ; 3 -?Close@GlobalWindowImpl@@UAGIPAUJSContext@@PAJI@Z ; 3 -?GetMimeTypes@NavigatorImpl@@UAGIPAPAVnsIDOMMimeTypeArray@@@Z ; 3 -NS_NewScriptHTMLElement ; 3 -NS_NewScriptHTMLPreElement ; 2 -NS_NewScriptHTMLUListElement ; 2 -??0nsDOMFactory@@QAE@ABUnsID@@@Z ; 2 -?SetDocShell@PluginArrayImpl@@QAEXPAVnsIDocShell@@@Z ; 2 -NS_InitHTMLPreElementClass ; 2 -?NamedItem@MimeTypeArrayImpl@@UAGIABVnsAString@@PAPAVnsIDOMMimeType@@@Z ; 2 -?GetAvailWidth@ScreenImpl@@UAGIPAH@Z ; 2 -?GetOnload@GlobalWindowImpl@@UAGIPAJ@Z ; 2 -??1nsDOMFactory@@MAE@XZ ; 2 -NS_InitHTMLAreaElementClass ; 2 -?GetPathname@LocationImpl@@UAGIAAVnsAString@@@Z ; 2 -?CheckSecurityWidthAndHeight@GlobalWindowImpl@@IAEIPAH0@Z ; 2 -?GetType@MimeTypeElementImpl@@UAGIAAVnsAString@@@Z ; 2 -??_GnsDOMWindowList@@UAEPAXI@Z ; 2 -??_ENavigatorImpl@@UAEPAXI@Z ; 2 -?SetScriptsEnabled@nsJSContext@@UAGIH@Z ; 2 -NS_InitHTMLUListElementClass ; 2 -??_EnsDOMFactory@@MAEPAXI@Z ; 2 -?GetInnerWidth@GlobalWindowImpl@@UAGIPAH@Z ; 2 -?GetScriptObject@MimeTypeElementImpl@@UAGIPAVnsIScriptContext@@PAPAX@Z ; 2 -NS_NewScriptHTMLSelectElement ; 2 -?GetDescription@PluginElementImpl@@UAGIAAVnsAString@@@Z ; 2 -??1nsDOMWindowList@@UAE@XZ ; 2 -??0PluginArrayImpl@@QAE@PAVnsIDOMNavigator@@PAVnsIDocShell@@@Z ; 2 -??1NavigatorImpl@@UAE@XZ ; 2 -?CreateInstance@nsDOMFactory@@UAGIPAVnsISupports@@ABUnsID@@PAPAX@Z ; 2 -?GetAvailHeight@ScreenImpl@@UAGIPAH@Z ; 2 -?GetHostname@LocationImpl@@UAGIAAVnsAString@@@Z ; 2 -?GetPlugins@PluginArrayImpl@@AAEIXZ ; 2 -NSGetFactory ; 2 -NS_InitHTMLSelectElementClass ; 2 -?GetOnerror@GlobalWindowImpl@@UAGIPAJ@Z ; 2 -?FlushPendingNotifications@GlobalWindowImpl@@IAEXXZ ; 2 -?GetInnerHeight@GlobalWindowImpl@@UAGIPAH@Z ; 2 -?GetAvailLeft@ScreenImpl@@UAGIPAH@Z ; 2 -?GetAvailTop@ScreenImpl@@UAGIPAH@Z ; 2 -NS_NewScriptHTMLAreaElement ; 2 -??0nsDOMScriptObjectFactory@@QAE@XZ ; 1 -??1ScreenImpl@@UAE@XZ ; 1 -??0MimeTypeArrayImpl@@QAE@PAVnsIDOMNavigator@@@Z ; 1 -NS_InitHTMLMapElementClass ; 1 -NS_InitDocumentTypeClass ; 1 -?GetMimeTypes@MimeTypeArrayImpl@@AAEIXZ ; 1 -NS_NewScriptHTMLBRElement ; 1 -??0nsJSEnvironment@@QAE@XZ ; 1 -??_GnsDOMScriptObjectFactory@@UAEPAXI@Z ; 1 -NS_InitDOMImplementationClass ; 1 -?NewScriptDOMImplementation@nsDOMScriptObjectFactory@@UAGIPAVnsIScriptContext@@PAVnsISupports@@1PAPAX@Z ; 1 -NS_NewScriptHTMLOptionElement ; 1 -NS_NewScriptDOMImplementation ; 1 -?Observe@nsJSEnvironment@@UAGIPAVnsISupports@@PBG1@Z ; 1 -NS_InitHTMLBRElementClass ; 1 -??0nsScriptNameSetRegistry@@QAE@XZ ; 1 -?GetEnabledPlugin@MimeTypeElementImpl@@UAGIPAPAVnsIDOMPlugin@@@Z ; 1 -??_EnsScriptNameSetRegistry@@UAEPAXI@Z ; 1 -??1nsScriptNameSetRegistry@@UAE@XZ ; 1 -??_GnsJSEnvironment@@UAEPAXI@Z ; 1 -NS_InitHTMLTextAreaElementClass ; 1 -??1nsJSEnvironment@@UAE@XZ ; 1 -?SetInnerHeight@GlobalWindowImpl@@UAGIH@Z ; 1 -??1LocationImpl@@UAE@XZ ; 1 -NS_NewScriptMimeTypeArray ; 1 -?GetProtocol@LocationImpl@@UAGIAAVnsAString@@@Z ; 1 -NS_InitMimeTypeClass ; 1 -??1nsDOMScriptObjectFactory@@UAE@XZ ; 1 -NS_InitMimeTypeArrayClass ; 1 -NS_NewScriptMimeType ; 1 -NS_NewScriptNSHTMLOptionCollection ; 1 -NS_NewScriptHTMLMapElement ; 1 -NS_InitNSHTMLOptionCollectionClass ; 1 -??_GLocationImpl@@UAEPAXI@Z ; 1 -?Open@GlobalWindowImpl@@UAGIPAUJSContext@@PAJIPAPAVnsIDOMWindowInternal@@@Z ; 1 -NS_NewScriptDocumentType ; 1 -?SetOnresize@GlobalWindowImpl@@UAGIJ@Z ; 1 -?SetInnerWidth@GlobalWindowImpl@@UAGIH@Z ; 1 -NS_NewScriptHTMLTextAreaElement ; 1 -?nsClearCachedSecurityManager@nsJSUtils@@SAXXZ ; 1 -??_EScreenImpl@@UAEPAXI@Z ; 1 -NS_NewScriptDocument ; 1 diff --git a/mozilla/dom/src/events/nsJSEventListener.h b/mozilla/dom/src/events/nsJSEventListener.h index f3872ba6641..45e9a9b77f7 100644 --- a/mozilla/dom/src/events/nsJSEventListener.h +++ b/mozilla/dom/src/events/nsJSEventListener.h @@ -75,6 +75,10 @@ protected: nsReturnResult mReturnResult; }; +/* factory function */ +nsresult NS_NewJSEventListener(nsIDOMEventListener **aInstancePtrResult, + nsIScriptContext *aContext, + nsISupports *aObject); #endif //nsJSEventListener_h__ diff --git a/mozilla/embedding/config/basebrowser-installer-win.pkg b/mozilla/embedding/config/basebrowser-installer-win.pkg index 430d7825480..40b5c89d9e2 100644 --- a/mozilla/embedding/config/basebrowser-installer-win.pkg +++ b/mozilla/embedding/config/basebrowser-installer-win.pkg @@ -161,7 +161,6 @@ components\uconv.xpt components\unicharutil.xpt ; dom -components\jsdom.dll components\dom.xpt components\dom_base.xpt components\dom_core.xpt diff --git a/mozilla/embedding/config/basebrowser-mac-macho b/mozilla/embedding/config/basebrowser-mac-macho index b4eb4bc70e4..2403f18a192 100644 --- a/mozilla/embedding/config/basebrowser-mac-macho +++ b/mozilla/embedding/config/basebrowser-mac-macho @@ -24,12 +24,6 @@ libplds4.dylib libmozjs.dylib -; -; DOM: -; -components/libjsdom.dylib - - ; ; XPCOM: ; diff --git a/mozilla/embedding/config/basebrowser-qnx b/mozilla/embedding/config/basebrowser-qnx index d9552d88f19..63e05bb5c17 100644 --- a/mozilla/embedding/config/basebrowser-qnx +++ b/mozilla/embedding/config/basebrowser-qnx @@ -139,7 +139,6 @@ components/unicharutil.xpt ; ; DOM: ; -components/libjsdom.so components/dom.xpt components/dom_base.xpt components/dom_core.xpt diff --git a/mozilla/embedding/config/basebrowser-unix b/mozilla/embedding/config/basebrowser-unix index f06c8e39b60..c82adeac151 100644 --- a/mozilla/embedding/config/basebrowser-unix +++ b/mozilla/embedding/config/basebrowser-unix @@ -140,7 +140,6 @@ components/unicharutil.xpt ; ; DOM: ; -components/libjsdom.so components/dom.xpt components/dom_base.xpt components/dom_core.xpt diff --git a/mozilla/embedding/config/basebrowser-win b/mozilla/embedding/config/basebrowser-win index 83e16855b68..61bf75e8ee4 100644 --- a/mozilla/embedding/config/basebrowser-win +++ b/mozilla/embedding/config/basebrowser-win @@ -168,7 +168,6 @@ components\uconv.xpt components\unicharutil.xpt ; dom -components\jsdom.dll components\dom.xpt components\dom_base.xpt components\dom_core.xpt diff --git a/mozilla/embedding/config/minimo-unix b/mozilla/embedding/config/minimo-unix index 504a87a882f..db24d7cad53 100644 --- a/mozilla/embedding/config/minimo-unix +++ b/mozilla/embedding/config/minimo-unix @@ -110,7 +110,6 @@ components/unicharutil.xpt ; ; DOM: ; -components/libjsdom.so components/dom.xpt components/dom_base.xpt components/dom_core.xpt diff --git a/mozilla/embedding/minimo/app/minimo-link-comps b/mozilla/embedding/minimo/app/minimo-link-comps index 117e8cb3663..9b9bdbffce6 100644 --- a/mozilla/embedding/minimo/app/minimo-link-comps +++ b/mozilla/embedding/minimo/app/minimo-link-comps @@ -11,7 +11,6 @@ htmlpars i18n imglib2 jar50 -jsdom necko nsappshell pipboot diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 3fe2068d126..8210c468df2 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -70,6 +70,9 @@ REQUIRES = xpcom \ xultmpl \ lwbrk \ plugin \ + commandhandler \ + webbrwsr \ + uconv \ $(NULL) CPPSRCS = \ @@ -99,6 +102,9 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/$(LIB_PREFIX)gkconxuldoc_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)gkconshared_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)gkview_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)jsdomevents_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)jsurl_s.$(LIB_SUFFIX) \ $(NULL) ifdef MOZ_XUL @@ -190,6 +196,8 @@ INCLUDES += -I$(srcdir)/../base/src \ -I$(srcdir)/../../content/xul/templates/src \ -I$(srcdir)/../../content/events/src \ -I$(topsrcdir)/view/src \ + -I$(topsrcdir)/dom/src/base \ + -I$(topsrcdir)/dom/src/jsurl \ -I. \ $(NULL) diff --git a/mozilla/layout/build/layout.pkg b/mozilla/layout/build/layout.pkg index c61a7a2cd88..dcc891fb7b7 100644 --- a/mozilla/layout/build/layout.pkg +++ b/mozilla/layout/build/layout.pkg @@ -12,6 +12,20 @@ dist/bin/components/@SHARED_LIBRARY@ !xpt dist/bin/components/content_htmldoc.xpt !xpt dist/bin/components/content_xmldoc.xpt !xpt dist/bin/components/content_xslt.xpt +!xpt dist/bin/components/dom.xpt +!xpt dist/bin/components/dom_base.xpt +!xpt dist/bin/components/dom_core.xpt +!xpt dist/bin/components/dom_css.xpt +!xpt dist/bin/components/dom_events.xpt +!xpt dist/bin/components/dom_html.xpt +!xpt dist/bin/components/dom_range.xpt +!xpt dist/bin/components/dom_stylesheets.xpt +!xpt dist/bin/components/dom_traversal.xpt +!xpt dist/bin/components/dom_views.xpt +!xpt dist/bin/components/dom_xbl.xpt +!xpt dist/bin/components/dom_xul.xpt +!xpt dist/bin/components/dom_xpath.xpt +!xpt dist/bin/components/jsurl.xpt #if MOZ_XUL !xpt dist/bin/components/xultmpl.xpt !xpt dist/bin/components/layout_xul_tree.xpt diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index 48733b640d6..522fbeb94b2 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -138,6 +138,17 @@ #include "nsScrollPortView.h" #include "nsViewManager.h" +// DOM includes +#include "nsDOMException.h" +#include "nsGlobalWindowCommands.h" +#include "nsIControllerCommandTable.h" +#include "nsJSProtocolHandler.h" +#include "nsGlobalWindow.h" +#include "nsDOMClassInfo.h" +#include "nsScriptNameSpaceManager.h" +#include "nsIControllerContext.h" +#include "nsDOMScriptObjectFactory.h" + class nsIDocumentLoaderFactory; #define PRODUCT_NAME "Gecko" @@ -152,6 +163,11 @@ class nsIDocumentLoaderFactory; #define NS_PLUGINDOCLOADERFACTORY_CID \ { 0x0ddf4df8, 0x4dbb, 0x4133, { 0x8b, 0x79, 0x9a, 0xfb, 0x96, 0x65, 0x14, 0xf5 } } +#define NS_WINDOWCOMMANDTABLE_CID \ + { /* 0DE2FBFA-6B7F-11D7-BBBA-0003938A9D96 */ \ + 0x0DE2FBFA, 0x6B7F, 0x11D7, {0xBB, 0xBA, 0x00, 0x03, 0x93, 0x8A, 0x9D, 0x96} } + +static NS_DEFINE_CID(kWindowCommandTableCID, NS_WINDOWCOMMANDTABLE_CID); #ifdef MOZ_XUL #include "nsIXULDocument.h" @@ -394,6 +410,9 @@ Shutdown(nsIModule* aSelf) NS_NameSpaceManagerShutdown(); nsImageLoadingContent::Shutdown(); nsStyleSet::FreeGlobals(); + + GlobalWindowImpl::ShutDown(); + nsDOMClassInfo::ShutDown(); } #ifdef NS_DEBUG @@ -720,6 +739,49 @@ UnregisterHTMLOptionElement(nsIComponentManager* aCompMgr, return NS_OK; } +static NS_METHOD +CreateWindowCommandTableConstructor(nsISupports *aOuter, + REFNSIID aIID, void **aResult) +{ + nsresult rv; + nsCOMPtr commandTable = + do_CreateInstance(NS_CONTROLLERCOMMANDTABLE_CONTRACTID, &rv); + if (NS_FAILED(rv)) return rv; + + rv = nsWindowCommandRegistration::RegisterWindowCommands(commandTable); + if (NS_FAILED(rv)) return rv; + + return commandTable->QueryInterface(aIID, aResult); +} + +static NS_METHOD +CreateWindowControllerWithSingletonCommandTable(nsISupports *aOuter, + REFNSIID aIID, void **aResult) +{ + nsresult rv; + nsCOMPtr controller = + do_CreateInstance("@mozilla.org/embedcomp/base-command-controller;1", &rv); + + if (NS_FAILED(rv)) return rv; + + nsCOMPtr windowCommandTable = do_GetService(kWindowCommandTableCID, &rv); + if (NS_FAILED(rv)) return rv; + + // this is a singleton; make it immutable + windowCommandTable->MakeImmutable(); + + nsCOMPtr controllerContext = do_QueryInterface(controller, &rv); + if (NS_FAILED(rv)) return rv; + + controllerContext->Init(windowCommandTable); + if (NS_FAILED(rv)) return rv; + + return controller->QueryInterface(aIID, aResult); +} + +NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMScriptObjectFactory) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsBaseDOMException) + // The list of components we register static const nsModuleComponentInfo gComponents[] = { #ifdef MOZ_SVG @@ -1254,6 +1316,32 @@ static const nsModuleComponentInfo gComponents[] = { NS_SYNCLOADDOMSERVICE_CONTRACTID, CreateSyncLoadDOMService }, + // DOM objects + { "Script Object Factory", + NS_DOM_SCRIPT_OBJECT_FACTORY_CID, + nsnull, + nsDOMScriptObjectFactoryConstructor + }, + { "Base DOM Exception", + NS_BASE_DOM_EXCEPTION_CID, + nsnull, + nsBaseDOMExceptionConstructor + }, + { "JavaScript Protocol Handler", + NS_JSPROTOCOLHANDLER_CID, + NS_JSPROTOCOLHANDLER_CONTRACTID, + nsJSProtocolHandler::Create }, + { "Window Command Table", + NS_WINDOWCOMMANDTABLE_CID, + "", + CreateWindowCommandTableConstructor + }, + { "Window Command Controller", + NS_WINDOWCONTROLLER_CID, + NS_WINDOWCONTROLLER_CONTRACTID, + CreateWindowControllerWithSingletonCommandTable + }, + // view stuff { "View Manager", NS_VIEW_MANAGER_CID, "@mozilla.org/view-manager;1", nsViewManagerConstructor }, diff --git a/mozilla/mail/config/basemail-win b/mozilla/mail/config/basemail-win index 1dc65eba4b9..ea7e52eb31e 100644 --- a/mozilla/mail/config/basemail-win +++ b/mozilla/mail/config/basemail-win @@ -215,7 +215,6 @@ components\unicharutil.xpt components\ucnative.xpt ; dom -components\jsdom.dll components\dom.xpt components\dom_base.xpt components\dom_core.xpt diff --git a/mozilla/modules/staticmod/Makefile.in b/mozilla/modules/staticmod/Makefile.in index e12daf862c6..06c75d154df 100644 --- a/mozilla/modules/staticmod/Makefile.in +++ b/mozilla/modules/staticmod/Makefile.in @@ -108,8 +108,7 @@ EXTRA_DSO_LDOPTS += \ $(XPCOM_LIBS) \ $(MOZ_JS_LIBS) \ $(NSPR_LIBS) \ - $(PNG_LIBS) \ - -ljsdom + $(PNG_LIBS) endif ifdef MOZ_META_COMPONENTS @@ -152,7 +151,7 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(TK_LIBS) \ $(NULL) - + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) OS_LIBS += -framework QuickTime endif diff --git a/mozilla/xpfe/bootstrap/os2turbo/mozturbo.cpp b/mozilla/xpfe/bootstrap/os2turbo/mozturbo.cpp index 23e1a7e49d2..877aaf6e6ad 100644 --- a/mozilla/xpfe/bootstrap/os2turbo/mozturbo.cpp +++ b/mozilla/xpfe/bootstrap/os2turbo/mozturbo.cpp @@ -95,7 +95,6 @@ char *compdir[] = { "I18N.DLL", "IMGLIB2.DLL", "JAR50.DLL", - "JSDOM.DLL", "MOZUCONV.DLL", "NECKO.DLL", "OJI.DLL", diff --git a/mozilla/xpinstall/packager/os2/browser.jst b/mozilla/xpinstall/packager/os2/browser.jst index d4d96972d4f..e635cab7816 100644 --- a/mozilla/xpinstall/packager/os2/browser.jst +++ b/mozilla/xpinstall/packager/os2/browser.jst @@ -36,6 +36,7 @@ function upgradeCleanup() deleteThisFolder("Chrome", "overlayinfo"); deleteThisFile("Components", "gkhtml.dll"); deleteThisFile("Components", "regviewr.dll"); + deleteThisFile("Components", "jsdom.dll"); } // main diff --git a/mozilla/xpinstall/packager/packages-os2 b/mozilla/xpinstall/packager/packages-os2 index 3e193a72750..1d0c1ec8011 100644 --- a/mozilla/xpinstall/packager/packages-os2 +++ b/mozilla/xpinstall/packager/packages-os2 @@ -110,7 +110,6 @@ bin/components/composer.xpt bin/components/docshell.dll ;bin/components/docshell_base.xpt bin/components/docshell.xpt -bin/components/jsdom.dll ;bin/components/jsd3250.dll bin/components/jsd.dll bin/components/jsdservice.xpt diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index 1da58b537c9..511ebecce18 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/xpinstall/packager/packages-unix @@ -90,7 +90,6 @@ bin/components/caps.xpt bin/components/cookie.xpt bin/components/libjsd.so bin/components/jsdservice.xpt -bin/components/libjsdom.so bin/components/dom.xpt bin/components/dom_base.xpt bin/components/dom_core.xpt diff --git a/mozilla/xpinstall/packager/unix/browser.jst b/mozilla/xpinstall/packager/unix/browser.jst index 357dd24583b..9e2e2c72c32 100644 --- a/mozilla/xpinstall/packager/unix/browser.jst +++ b/mozilla/xpinstall/packager/unix/browser.jst @@ -36,6 +36,7 @@ function upgradeCleanup() deleteThisFile("Components", "liburiloader.so"); deleteThisFile("Components", "libgkview.so"); deleteThisFile("Components", "libshistory.so"); + deleteThisFile("Components", "libjsdom.so"); deleteThisFile("Components", "compreg.dat"); deleteThisFile("Components", "xpti.dat"); deleteThisFile("Components", "xptitemp.dat"); diff --git a/mozilla/xpinstall/wizard/unix/src2/.LIBSREQD.list b/mozilla/xpinstall/wizard/unix/src2/.LIBSREQD.list index a1e91288d43..34ec9ccc52c 100644 --- a/mozilla/xpinstall/wizard/unix/src2/.LIBSREQD.list +++ b/mozilla/xpinstall/wizard/unix/src2/.LIBSREQD.list @@ -1,5 +1,4 @@ libjar50.so -libjsdom.so libmozjs.so libnspr3.so libplc3.so