From 555ae1b32569e062f14be63e0da6b669274edac8 Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Wed, 11 Mar 2009 10:10:19 -0400 Subject: [PATCH] Bug 481102 - Reorganize dom/public, dom/public/base, and dom/src/base to dom/base, r+sr=jst --HG-- rename : dom/src/base/Makefile.in => dom/base/Makefile.in rename : dom/src/base/crashtests/244933-1.html => dom/base/crashtests/244933-1.html rename : dom/src/base/crashtests/275912-1.html => dom/base/crashtests/275912-1.html rename : dom/src/base/crashtests/327571-1.html => dom/base/crashtests/327571-1.html rename : dom/src/base/crashtests/327695-1.html => dom/base/crashtests/327695-1.html rename : dom/src/base/crashtests/329481-1.xhtml => dom/base/crashtests/329481-1.xhtml rename : dom/src/base/crashtests/338674-1.xhtml => dom/base/crashtests/338674-1.xhtml rename : dom/src/base/crashtests/346381-1.html => dom/base/crashtests/346381-1.html rename : dom/src/base/crashtests/359432-1.xhtml => dom/base/crashtests/359432-1.xhtml rename : dom/src/base/crashtests/369413-1.html => dom/base/crashtests/369413-1.html rename : dom/src/base/crashtests/372554-1.html => dom/base/crashtests/372554-1.html rename : dom/src/base/crashtests/404869-1.xul => dom/base/crashtests/404869-1.xul rename : dom/src/base/crashtests/439206-1.html => dom/base/crashtests/439206-1.html rename : dom/src/base/crashtests/462947.html => dom/base/crashtests/462947.html rename : dom/src/base/crashtests/473284.xul => dom/base/crashtests/473284.xul rename : dom/src/base/crashtests/90613-1.html => dom/base/crashtests/90613-1.html rename : dom/src/base/crashtests/crashtests.list => dom/base/crashtests/crashtests.list rename : dom/src/base/domerr.msg => dom/base/domerr.msg rename : dom/src/base/nsBarProps.cpp => dom/base/nsBarProps.cpp rename : dom/src/base/nsBarProps.h => dom/base/nsBarProps.h rename : dom/public/nsDOMCID.h => dom/base/nsDOMCID.h rename : dom/src/base/nsDOMClassInfo.cpp => dom/base/nsDOMClassInfo.cpp rename : dom/src/base/nsDOMClassInfo.h => dom/base/nsDOMClassInfo.h rename : dom/public/nsDOMClassInfoID.h => dom/base/nsDOMClassInfoID.h rename : dom/public/nsDOMError.h => dom/base/nsDOMError.h rename : dom/src/base/nsDOMException.cpp => dom/base/nsDOMException.cpp rename : dom/src/base/nsDOMException.h => dom/base/nsDOMException.h rename : dom/public/nsDOMJSUtils.h => dom/base/nsDOMJSUtils.h rename : dom/src/base/nsDOMScriptObjectFactory.cpp => dom/base/nsDOMScriptObjectFactory.cpp rename : dom/src/base/nsDOMScriptObjectFactory.h => dom/base/nsDOMScriptObjectFactory.h rename : dom/public/nsDOMScriptObjectHolder.h => dom/base/nsDOMScriptObjectHolder.h rename : dom/public/nsDOMString.h => dom/base/nsDOMString.h rename : dom/src/base/nsDOMWindowList.cpp => dom/base/nsDOMWindowList.cpp rename : dom/src/base/nsDOMWindowList.h => dom/base/nsDOMWindowList.h rename : dom/src/base/nsDOMWindowUtils.cpp => dom/base/nsDOMWindowUtils.cpp rename : dom/src/base/nsDOMWindowUtils.h => dom/base/nsDOMWindowUtils.h rename : dom/src/base/nsFocusController.cpp => dom/base/nsFocusController.cpp rename : dom/src/base/nsFocusController.h => dom/base/nsFocusController.h rename : dom/src/base/nsGlobalWindow.cpp => dom/base/nsGlobalWindow.cpp rename : dom/src/base/nsGlobalWindow.h => dom/base/nsGlobalWindow.h rename : dom/src/base/nsGlobalWindowCommands.cpp => dom/base/nsGlobalWindowCommands.cpp rename : dom/src/base/nsGlobalWindowCommands.h => dom/base/nsGlobalWindowCommands.h rename : dom/src/base/nsHistory.cpp => dom/base/nsHistory.cpp rename : dom/src/base/nsHistory.h => dom/base/nsHistory.h rename : dom/public/nsIBaseDOMException.h => dom/base/nsIBaseDOMException.h rename : dom/public/nsIDOMClassInfo.h => dom/base/nsIDOMClassInfo.h rename : dom/public/nsIDOMScriptObjectFactory.h => dom/base/nsIDOMScriptObjectFactory.h rename : dom/public/nsIEntropyCollector.idl => dom/base/nsIEntropyCollector.idl rename : dom/public/base/nsIFocusController.h => dom/base/nsIFocusController.h rename : dom/public/nsIJSEventListener.h => dom/base/nsIJSEventListener.h rename : dom/public/nsIJSNativeInitializer.h => dom/base/nsIJSNativeInitializer.h rename : dom/public/nsIScriptChannel.idl => dom/base/nsIScriptChannel.idl rename : dom/public/nsIScriptContext.h => dom/base/nsIScriptContext.h rename : dom/public/nsIScriptExternalNameSet.h => dom/base/nsIScriptExternalNameSet.h rename : dom/public/nsIScriptGlobalObject.h => dom/base/nsIScriptGlobalObject.h rename : dom/public/nsIScriptGlobalObjectOwner.h => dom/base/nsIScriptGlobalObjectOwner.h rename : dom/public/nsIScriptNameSpaceManager.h => dom/base/nsIScriptNameSpaceManager.h rename : dom/public/nsIScriptObjectOwner.h => dom/base/nsIScriptObjectOwner.h rename : dom/public/nsIScriptObjectPrincipal.h => dom/base/nsIScriptObjectPrincipal.h rename : dom/public/nsIScriptRuntime.h => dom/base/nsIScriptRuntime.h rename : dom/public/nsIScriptTimeoutHandler.h => dom/base/nsIScriptTimeoutHandler.h rename : dom/src/base/nsJSEnvironment.cpp => dom/base/nsJSEnvironment.cpp rename : dom/src/base/nsJSEnvironment.h => dom/base/nsJSEnvironment.h rename : dom/src/base/nsJSTimeoutHandler.cpp => dom/base/nsJSTimeoutHandler.cpp rename : dom/src/base/nsJSUtils.cpp => dom/base/nsJSUtils.cpp rename : dom/src/base/nsJSUtils.h => dom/base/nsJSUtils.h rename : dom/src/base/nsLocation.cpp => dom/base/nsLocation.cpp rename : dom/src/base/nsMimeTypeArray.cpp => dom/base/nsMimeTypeArray.cpp rename : dom/src/base/nsMimeTypeArray.h => dom/base/nsMimeTypeArray.h rename : dom/public/base/nsPIDOMWindow.h => dom/base/nsPIDOMWindow.h rename : dom/public/base/nsPIWindowRoot.h => dom/base/nsPIWindowRoot.h rename : dom/src/base/nsPluginArray.cpp => dom/base/nsPluginArray.cpp rename : dom/src/base/nsPluginArray.h => dom/base/nsPluginArray.h rename : dom/src/base/nsScreen.cpp => dom/base/nsScreen.cpp rename : dom/src/base/nsScreen.h => dom/base/nsScreen.h rename : dom/src/base/nsScriptNameSpaceManager.cpp => dom/base/nsScriptNameSpaceManager.cpp rename : dom/src/base/nsScriptNameSpaceManager.h => dom/base/nsScriptNameSpaceManager.h rename : dom/src/base/nsWindowRoot.cpp => dom/base/nsWindowRoot.cpp rename : dom/src/base/nsWindowRoot.h => dom/base/nsWindowRoot.h rename : dom/public/nsWrapperCache.h => dom/base/nsWrapperCache.h --- content/base/src/Makefile.in | 2 +- content/events/src/Makefile.in | 2 +- content/html/document/src/Makefile.in | 2 +- content/xbl/src/Makefile.in | 2 +- content/xml/document/src/Makefile.in | 2 +- dom/Makefile.in | 3 +- dom/{src => }/base/Makefile.in | 100 ++++++------------ dom/{src => }/base/crashtests/244933-1.html | 0 dom/{src => }/base/crashtests/275912-1.html | 0 dom/{src => }/base/crashtests/327571-1.html | 0 dom/{src => }/base/crashtests/327695-1.html | 0 dom/{src => }/base/crashtests/329481-1.xhtml | 0 dom/{src => }/base/crashtests/338674-1.xhtml | 0 dom/{src => }/base/crashtests/346381-1.html | 0 dom/{src => }/base/crashtests/359432-1.xhtml | 0 dom/{src => }/base/crashtests/369413-1.html | 0 dom/{src => }/base/crashtests/372554-1.html | 0 dom/{src => }/base/crashtests/404869-1.xul | 0 dom/{src => }/base/crashtests/439206-1.html | 0 dom/{src => }/base/crashtests/462947.html | 0 dom/{src => }/base/crashtests/473284.xul | 0 dom/{src => }/base/crashtests/90613-1.html | 0 dom/{src => }/base/crashtests/crashtests.list | 0 dom/{src => }/base/domerr.msg | 0 dom/{src => }/base/nsBarProps.cpp | 0 dom/{src => }/base/nsBarProps.h | 0 dom/{public => base}/nsDOMCID.h | 0 dom/{src => }/base/nsDOMClassInfo.cpp | 0 dom/{src => }/base/nsDOMClassInfo.h | 0 dom/{public => base}/nsDOMClassInfoID.h | 0 dom/{public => base}/nsDOMError.h | 0 dom/{src => }/base/nsDOMException.cpp | 0 dom/{src => }/base/nsDOMException.h | 0 dom/{public => base}/nsDOMJSUtils.h | 0 .../base/nsDOMScriptObjectFactory.cpp | 0 dom/{src => }/base/nsDOMScriptObjectFactory.h | 0 .../nsDOMScriptObjectHolder.h | 0 dom/{public => base}/nsDOMString.h | 0 dom/{src => }/base/nsDOMWindowList.cpp | 0 dom/{src => }/base/nsDOMWindowList.h | 0 dom/{src => }/base/nsDOMWindowUtils.cpp | 0 dom/{src => }/base/nsDOMWindowUtils.h | 0 dom/{src => }/base/nsFocusController.cpp | 0 dom/{src => }/base/nsFocusController.h | 0 dom/{src => }/base/nsGlobalWindow.cpp | 0 dom/{src => }/base/nsGlobalWindow.h | 0 dom/{src => }/base/nsGlobalWindowCommands.cpp | 0 dom/{src => }/base/nsGlobalWindowCommands.h | 0 dom/{src => }/base/nsHistory.cpp | 0 dom/{src => }/base/nsHistory.h | 0 dom/{public => base}/nsIBaseDOMException.h | 0 dom/{public => base}/nsIDOMClassInfo.h | 0 .../nsIDOMScriptObjectFactory.h | 0 dom/{public => base}/nsIEntropyCollector.idl | 0 dom/{public => }/base/nsIFocusController.h | 0 dom/{public => base}/nsIJSEventListener.h | 0 dom/{public => base}/nsIJSNativeInitializer.h | 0 dom/{public => base}/nsIScriptChannel.idl | 0 dom/{public => base}/nsIScriptContext.h | 0 .../nsIScriptExternalNameSet.h | 0 dom/{public => base}/nsIScriptGlobalObject.h | 0 .../nsIScriptGlobalObjectOwner.h | 0 .../nsIScriptNameSpaceManager.h | 0 dom/{public => base}/nsIScriptObjectOwner.h | 0 .../nsIScriptObjectPrincipal.h | 0 dom/{public => base}/nsIScriptRuntime.h | 0 .../nsIScriptTimeoutHandler.h | 0 dom/{src => }/base/nsJSEnvironment.cpp | 0 dom/{src => }/base/nsJSEnvironment.h | 0 dom/{src => }/base/nsJSTimeoutHandler.cpp | 0 dom/{src => }/base/nsJSUtils.cpp | 0 dom/{src => }/base/nsJSUtils.h | 0 dom/{src => }/base/nsLocation.cpp | 0 dom/{src => }/base/nsMimeTypeArray.cpp | 0 dom/{src => }/base/nsMimeTypeArray.h | 0 dom/{public => }/base/nsPIDOMWindow.h | 0 dom/{public => }/base/nsPIWindowRoot.h | 0 dom/{src => }/base/nsPluginArray.cpp | 0 dom/{src => }/base/nsPluginArray.h | 0 dom/{src => }/base/nsScreen.cpp | 0 dom/{src => }/base/nsScreen.h | 0 .../base/nsScriptNameSpaceManager.cpp | 0 dom/{src => }/base/nsScriptNameSpaceManager.h | 0 dom/{src => }/base/nsWindowRoot.cpp | 0 dom/{src => }/base/nsWindowRoot.h | 0 dom/{public => base}/nsWrapperCache.h | 0 dom/dom-config.mk | 69 ++++++++++++ dom/public/Makefile.in | 77 -------------- dom/public/base/Makefile.in | 51 --------- dom/src/Makefile.in | 2 +- dom/src/events/Makefile.in | 2 +- dom/src/geolocation/Makefile.in | 2 +- dom/src/jsurl/Makefile.in | 2 +- dom/src/offline/Makefile.in | 2 +- dom/src/storage/Makefile.in | 2 +- dom/src/threads/Makefile.in | 2 +- layout/base/Makefile.in | 2 +- layout/build/Makefile.in | 4 +- layout/generic/Makefile.in | 2 +- testing/crashtest/crashtests.list | 2 +- toolkit/toolkit-makefiles.sh | 4 +- 101 files changed, 122 insertions(+), 216 deletions(-) rename dom/{src => }/base/Makefile.in (67%) rename dom/{src => }/base/crashtests/244933-1.html (100%) rename dom/{src => }/base/crashtests/275912-1.html (100%) rename dom/{src => }/base/crashtests/327571-1.html (100%) rename dom/{src => }/base/crashtests/327695-1.html (100%) rename dom/{src => }/base/crashtests/329481-1.xhtml (100%) rename dom/{src => }/base/crashtests/338674-1.xhtml (100%) rename dom/{src => }/base/crashtests/346381-1.html (100%) rename dom/{src => }/base/crashtests/359432-1.xhtml (100%) rename dom/{src => }/base/crashtests/369413-1.html (100%) rename dom/{src => }/base/crashtests/372554-1.html (100%) rename dom/{src => }/base/crashtests/404869-1.xul (100%) rename dom/{src => }/base/crashtests/439206-1.html (100%) rename dom/{src => }/base/crashtests/462947.html (100%) rename dom/{src => }/base/crashtests/473284.xul (100%) rename dom/{src => }/base/crashtests/90613-1.html (100%) rename dom/{src => }/base/crashtests/crashtests.list (100%) rename dom/{src => }/base/domerr.msg (100%) rename dom/{src => }/base/nsBarProps.cpp (100%) rename dom/{src => }/base/nsBarProps.h (100%) rename dom/{public => base}/nsDOMCID.h (100%) rename dom/{src => }/base/nsDOMClassInfo.cpp (100%) rename dom/{src => }/base/nsDOMClassInfo.h (100%) rename dom/{public => base}/nsDOMClassInfoID.h (100%) rename dom/{public => base}/nsDOMError.h (100%) rename dom/{src => }/base/nsDOMException.cpp (100%) rename dom/{src => }/base/nsDOMException.h (100%) rename dom/{public => base}/nsDOMJSUtils.h (100%) rename dom/{src => }/base/nsDOMScriptObjectFactory.cpp (100%) rename dom/{src => }/base/nsDOMScriptObjectFactory.h (100%) rename dom/{public => base}/nsDOMScriptObjectHolder.h (100%) rename dom/{public => base}/nsDOMString.h (100%) rename dom/{src => }/base/nsDOMWindowList.cpp (100%) rename dom/{src => }/base/nsDOMWindowList.h (100%) rename dom/{src => }/base/nsDOMWindowUtils.cpp (100%) rename dom/{src => }/base/nsDOMWindowUtils.h (100%) rename dom/{src => }/base/nsFocusController.cpp (100%) rename dom/{src => }/base/nsFocusController.h (100%) rename dom/{src => }/base/nsGlobalWindow.cpp (100%) rename dom/{src => }/base/nsGlobalWindow.h (100%) rename dom/{src => }/base/nsGlobalWindowCommands.cpp (100%) rename dom/{src => }/base/nsGlobalWindowCommands.h (100%) rename dom/{src => }/base/nsHistory.cpp (100%) rename dom/{src => }/base/nsHistory.h (100%) rename dom/{public => base}/nsIBaseDOMException.h (100%) rename dom/{public => base}/nsIDOMClassInfo.h (100%) rename dom/{public => base}/nsIDOMScriptObjectFactory.h (100%) rename dom/{public => base}/nsIEntropyCollector.idl (100%) rename dom/{public => }/base/nsIFocusController.h (100%) rename dom/{public => base}/nsIJSEventListener.h (100%) rename dom/{public => base}/nsIJSNativeInitializer.h (100%) rename dom/{public => base}/nsIScriptChannel.idl (100%) rename dom/{public => base}/nsIScriptContext.h (100%) rename dom/{public => base}/nsIScriptExternalNameSet.h (100%) rename dom/{public => base}/nsIScriptGlobalObject.h (100%) rename dom/{public => base}/nsIScriptGlobalObjectOwner.h (100%) rename dom/{public => base}/nsIScriptNameSpaceManager.h (100%) rename dom/{public => base}/nsIScriptObjectOwner.h (100%) rename dom/{public => base}/nsIScriptObjectPrincipal.h (100%) rename dom/{public => base}/nsIScriptRuntime.h (100%) rename dom/{public => base}/nsIScriptTimeoutHandler.h (100%) rename dom/{src => }/base/nsJSEnvironment.cpp (100%) rename dom/{src => }/base/nsJSEnvironment.h (100%) rename dom/{src => }/base/nsJSTimeoutHandler.cpp (100%) rename dom/{src => }/base/nsJSUtils.cpp (100%) rename dom/{src => }/base/nsJSUtils.h (100%) rename dom/{src => }/base/nsLocation.cpp (100%) rename dom/{src => }/base/nsMimeTypeArray.cpp (100%) rename dom/{src => }/base/nsMimeTypeArray.h (100%) rename dom/{public => }/base/nsPIDOMWindow.h (100%) rename dom/{public => }/base/nsPIWindowRoot.h (100%) rename dom/{src => }/base/nsPluginArray.cpp (100%) rename dom/{src => }/base/nsPluginArray.h (100%) rename dom/{src => }/base/nsScreen.cpp (100%) rename dom/{src => }/base/nsScreen.h (100%) rename dom/{src => }/base/nsScriptNameSpaceManager.cpp (100%) rename dom/{src => }/base/nsScriptNameSpaceManager.h (100%) rename dom/{src => }/base/nsWindowRoot.cpp (100%) rename dom/{src => }/base/nsWindowRoot.h (100%) rename dom/{public => base}/nsWrapperCache.h (100%) create mode 100644 dom/dom-config.mk delete mode 100644 dom/public/Makefile.in delete mode 100644 dom/public/base/Makefile.in diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index a3702b6a6a07..36115a831ffc 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -193,7 +193,7 @@ INCLUDES += \ -I$(srcdir)/../../xbl/src \ -I$(srcdir)/../../../layout/generic \ -I$(srcdir)/../../../layout/style \ - -I$(srcdir)/../../../dom/src/base \ + -I$(srcdir)/../../../dom/base \ -I$(srcdir)/../../xml/document/src \ -I$(topsrcdir)/xpcom/io \ $(NULL) diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index 6d69bddef2a7..edc75b461245 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -108,7 +108,7 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../html/base/src \ -I$(srcdir)/../../xul/content/src \ -I$(srcdir)/../../xml/content/src \ - -I$(srcdir)/../../../dom/src/base \ + -I$(srcdir)/../../../dom/base \ -I$(srcdir)/../../../layout/generic \ -I$(srcdir)/../../../layout/xul/base/src \ -I$(srcdir)/../../../layout/xul/base/src/tree/src \ diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index 6f16e9cbcdc8..6423123f20e2 100644 --- a/content/html/document/src/Makefile.in +++ b/content/html/document/src/Makefile.in @@ -107,7 +107,7 @@ INCLUDES += \ -I$(srcdir)/../../../events/src \ -I$(srcdir)/../../content/src \ -I$(srcdir)/../../../../layout/style \ - -I$(srcdir)/../../../../dom/src/base \ + -I$(srcdir)/../../../../dom/base \ $(NULL) DEFINES += -D_IMPL_NS_LAYOUT diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 2312809a346f..0bb2c8ef46f3 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -110,7 +110,7 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../xul/document/src \ -I$(srcdir)/../../events/src \ -I$(srcdir)/../../../layout/style \ - -I$(srcdir)/../../../dom/src/base \ + -I$(srcdir)/../../../dom/base \ $(NULL) DEFINES += -D_IMPL_NS_LAYOUT diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index 533119c0ad3b..e967cd88ef56 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -90,7 +90,7 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../../base/src \ -I$(srcdir)/../../../xul/content/src \ -I$(srcdir)/../../../events/src \ - -I$(srcdir)/../../../../dom/src/base \ + -I$(srcdir)/../../../../dom/base \ $(NULL) DEFINES += -D_IMPL_NS_LAYOUT diff --git a/dom/Makefile.in b/dom/Makefile.in index c065607fdc25..6858d5ff5038 100644 --- a/dom/Makefile.in +++ b/dom/Makefile.in @@ -75,7 +75,8 @@ DIRS += interfaces/smil endif DIRS += \ - public \ + public/coreEvents \ + base \ src \ locales \ tests \ diff --git a/dom/src/base/Makefile.in b/dom/base/Makefile.in similarity index 67% rename from dom/src/base/Makefile.in rename to dom/base/Makefile.in index 2d64ac6d6db4..bceae189f52d 100644 --- a/dom/src/base/Makefile.in +++ b/dom/base/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -45,54 +45,39 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdombase_s LIBXUL_LIBRARY = 1 +FORCE_STATIC_LIB = 1 -REQUIRES = xpcom \ - string \ - webbrwsr \ - commandhandler \ - js \ - widget \ - gfx \ - thebes \ - layout \ - content \ - caps \ - docshell \ - xpconnect \ - pref \ - oji \ - necko \ - nkcache \ - mimetype \ - java \ - locale \ - prefetch \ - xuldoc \ - webshell \ - view \ - uconv \ - shistory \ - plugin \ - windowwatcher \ - chardet \ - find \ - appshell \ - intl \ - unicharutil \ - rdf \ - xultmpl \ - jar \ - storage \ - htmlparser \ - $(NULL) +XPIDLSRCS = \ + nsIEntropyCollector.idl \ + nsIScriptChannel.idl \ + $(NULL) -ifdef NS_TRACE_MALLOC -REQUIRES += tracemalloc -endif - -ifdef MOZ_JSDEBUGGER -REQUIRES += jsdebug -endif +EXPORTS = \ + nsDOMCID.h \ + nsDOMClassInfoID.h \ + nsDOMError.h \ + nsDOMJSUtils.h \ + nsDOMScriptObjectHolder.h \ + nsDOMString.h \ + nsIBaseDOMException.h \ + nsIDOMClassInfo.h \ + nsIDOMScriptObjectFactory.h \ + nsIFocusController.h \ + nsIJSEventListener.h \ + nsIJSNativeInitializer.h \ + nsIScriptContext.h \ + nsIScriptExternalNameSet.h \ + nsIScriptGlobalObject.h \ + nsIScriptGlobalObjectOwner.h \ + nsIScriptNameSpaceManager.h \ + nsIScriptObjectOwner.h \ + nsIScriptObjectPrincipal.h \ + nsIScriptRuntime.h \ + nsIScriptTimeoutHandler.h \ + nsPIDOMWindow.h \ + nsPIWindowRoot.h \ + nsWrapperCache.h \ + $(NULL) CPPSRCS = \ nsBarProps.cpp \ @@ -116,26 +101,7 @@ CPPSRCS = \ 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 \ - -I$(srcdir)/../storage \ - -I$(srcdir)/../offline \ - -I$(srcdir)/../geolocation \ - -I$(srcdir)/../threads \ - -I$(topsrcdir)/content/xbl/src \ - -I$(topsrcdir)/content/xul/document/src \ - -I$(topsrcdir)/content/events/src \ - -I$(topsrcdir)/content/base/src \ - -I$(topsrcdir)/content/html/document/src \ - -I$(topsrcdir)/layout/style \ - -I$(topsrcdir)/layout/xul/base/src/tree/src \ - $(NULL) - -DEFINES += -D_IMPL_NS_LAYOUT +include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_JSDEBUGGER DEFINES += -DMOZ_JSDEBUGGER diff --git a/dom/src/base/crashtests/244933-1.html b/dom/base/crashtests/244933-1.html similarity index 100% rename from dom/src/base/crashtests/244933-1.html rename to dom/base/crashtests/244933-1.html diff --git a/dom/src/base/crashtests/275912-1.html b/dom/base/crashtests/275912-1.html similarity index 100% rename from dom/src/base/crashtests/275912-1.html rename to dom/base/crashtests/275912-1.html diff --git a/dom/src/base/crashtests/327571-1.html b/dom/base/crashtests/327571-1.html similarity index 100% rename from dom/src/base/crashtests/327571-1.html rename to dom/base/crashtests/327571-1.html diff --git a/dom/src/base/crashtests/327695-1.html b/dom/base/crashtests/327695-1.html similarity index 100% rename from dom/src/base/crashtests/327695-1.html rename to dom/base/crashtests/327695-1.html diff --git a/dom/src/base/crashtests/329481-1.xhtml b/dom/base/crashtests/329481-1.xhtml similarity index 100% rename from dom/src/base/crashtests/329481-1.xhtml rename to dom/base/crashtests/329481-1.xhtml diff --git a/dom/src/base/crashtests/338674-1.xhtml b/dom/base/crashtests/338674-1.xhtml similarity index 100% rename from dom/src/base/crashtests/338674-1.xhtml rename to dom/base/crashtests/338674-1.xhtml diff --git a/dom/src/base/crashtests/346381-1.html b/dom/base/crashtests/346381-1.html similarity index 100% rename from dom/src/base/crashtests/346381-1.html rename to dom/base/crashtests/346381-1.html diff --git a/dom/src/base/crashtests/359432-1.xhtml b/dom/base/crashtests/359432-1.xhtml similarity index 100% rename from dom/src/base/crashtests/359432-1.xhtml rename to dom/base/crashtests/359432-1.xhtml diff --git a/dom/src/base/crashtests/369413-1.html b/dom/base/crashtests/369413-1.html similarity index 100% rename from dom/src/base/crashtests/369413-1.html rename to dom/base/crashtests/369413-1.html diff --git a/dom/src/base/crashtests/372554-1.html b/dom/base/crashtests/372554-1.html similarity index 100% rename from dom/src/base/crashtests/372554-1.html rename to dom/base/crashtests/372554-1.html diff --git a/dom/src/base/crashtests/404869-1.xul b/dom/base/crashtests/404869-1.xul similarity index 100% rename from dom/src/base/crashtests/404869-1.xul rename to dom/base/crashtests/404869-1.xul diff --git a/dom/src/base/crashtests/439206-1.html b/dom/base/crashtests/439206-1.html similarity index 100% rename from dom/src/base/crashtests/439206-1.html rename to dom/base/crashtests/439206-1.html diff --git a/dom/src/base/crashtests/462947.html b/dom/base/crashtests/462947.html similarity index 100% rename from dom/src/base/crashtests/462947.html rename to dom/base/crashtests/462947.html diff --git a/dom/src/base/crashtests/473284.xul b/dom/base/crashtests/473284.xul similarity index 100% rename from dom/src/base/crashtests/473284.xul rename to dom/base/crashtests/473284.xul diff --git a/dom/src/base/crashtests/90613-1.html b/dom/base/crashtests/90613-1.html similarity index 100% rename from dom/src/base/crashtests/90613-1.html rename to dom/base/crashtests/90613-1.html diff --git a/dom/src/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list similarity index 100% rename from dom/src/base/crashtests/crashtests.list rename to dom/base/crashtests/crashtests.list diff --git a/dom/src/base/domerr.msg b/dom/base/domerr.msg similarity index 100% rename from dom/src/base/domerr.msg rename to dom/base/domerr.msg diff --git a/dom/src/base/nsBarProps.cpp b/dom/base/nsBarProps.cpp similarity index 100% rename from dom/src/base/nsBarProps.cpp rename to dom/base/nsBarProps.cpp diff --git a/dom/src/base/nsBarProps.h b/dom/base/nsBarProps.h similarity index 100% rename from dom/src/base/nsBarProps.h rename to dom/base/nsBarProps.h diff --git a/dom/public/nsDOMCID.h b/dom/base/nsDOMCID.h similarity index 100% rename from dom/public/nsDOMCID.h rename to dom/base/nsDOMCID.h diff --git a/dom/src/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp similarity index 100% rename from dom/src/base/nsDOMClassInfo.cpp rename to dom/base/nsDOMClassInfo.cpp diff --git a/dom/src/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h similarity index 100% rename from dom/src/base/nsDOMClassInfo.h rename to dom/base/nsDOMClassInfo.h diff --git a/dom/public/nsDOMClassInfoID.h b/dom/base/nsDOMClassInfoID.h similarity index 100% rename from dom/public/nsDOMClassInfoID.h rename to dom/base/nsDOMClassInfoID.h diff --git a/dom/public/nsDOMError.h b/dom/base/nsDOMError.h similarity index 100% rename from dom/public/nsDOMError.h rename to dom/base/nsDOMError.h diff --git a/dom/src/base/nsDOMException.cpp b/dom/base/nsDOMException.cpp similarity index 100% rename from dom/src/base/nsDOMException.cpp rename to dom/base/nsDOMException.cpp diff --git a/dom/src/base/nsDOMException.h b/dom/base/nsDOMException.h similarity index 100% rename from dom/src/base/nsDOMException.h rename to dom/base/nsDOMException.h diff --git a/dom/public/nsDOMJSUtils.h b/dom/base/nsDOMJSUtils.h similarity index 100% rename from dom/public/nsDOMJSUtils.h rename to dom/base/nsDOMJSUtils.h diff --git a/dom/src/base/nsDOMScriptObjectFactory.cpp b/dom/base/nsDOMScriptObjectFactory.cpp similarity index 100% rename from dom/src/base/nsDOMScriptObjectFactory.cpp rename to dom/base/nsDOMScriptObjectFactory.cpp diff --git a/dom/src/base/nsDOMScriptObjectFactory.h b/dom/base/nsDOMScriptObjectFactory.h similarity index 100% rename from dom/src/base/nsDOMScriptObjectFactory.h rename to dom/base/nsDOMScriptObjectFactory.h diff --git a/dom/public/nsDOMScriptObjectHolder.h b/dom/base/nsDOMScriptObjectHolder.h similarity index 100% rename from dom/public/nsDOMScriptObjectHolder.h rename to dom/base/nsDOMScriptObjectHolder.h diff --git a/dom/public/nsDOMString.h b/dom/base/nsDOMString.h similarity index 100% rename from dom/public/nsDOMString.h rename to dom/base/nsDOMString.h diff --git a/dom/src/base/nsDOMWindowList.cpp b/dom/base/nsDOMWindowList.cpp similarity index 100% rename from dom/src/base/nsDOMWindowList.cpp rename to dom/base/nsDOMWindowList.cpp diff --git a/dom/src/base/nsDOMWindowList.h b/dom/base/nsDOMWindowList.h similarity index 100% rename from dom/src/base/nsDOMWindowList.h rename to dom/base/nsDOMWindowList.h diff --git a/dom/src/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp similarity index 100% rename from dom/src/base/nsDOMWindowUtils.cpp rename to dom/base/nsDOMWindowUtils.cpp diff --git a/dom/src/base/nsDOMWindowUtils.h b/dom/base/nsDOMWindowUtils.h similarity index 100% rename from dom/src/base/nsDOMWindowUtils.h rename to dom/base/nsDOMWindowUtils.h diff --git a/dom/src/base/nsFocusController.cpp b/dom/base/nsFocusController.cpp similarity index 100% rename from dom/src/base/nsFocusController.cpp rename to dom/base/nsFocusController.cpp diff --git a/dom/src/base/nsFocusController.h b/dom/base/nsFocusController.h similarity index 100% rename from dom/src/base/nsFocusController.h rename to dom/base/nsFocusController.h diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp similarity index 100% rename from dom/src/base/nsGlobalWindow.cpp rename to dom/base/nsGlobalWindow.cpp diff --git a/dom/src/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h similarity index 100% rename from dom/src/base/nsGlobalWindow.h rename to dom/base/nsGlobalWindow.h diff --git a/dom/src/base/nsGlobalWindowCommands.cpp b/dom/base/nsGlobalWindowCommands.cpp similarity index 100% rename from dom/src/base/nsGlobalWindowCommands.cpp rename to dom/base/nsGlobalWindowCommands.cpp diff --git a/dom/src/base/nsGlobalWindowCommands.h b/dom/base/nsGlobalWindowCommands.h similarity index 100% rename from dom/src/base/nsGlobalWindowCommands.h rename to dom/base/nsGlobalWindowCommands.h diff --git a/dom/src/base/nsHistory.cpp b/dom/base/nsHistory.cpp similarity index 100% rename from dom/src/base/nsHistory.cpp rename to dom/base/nsHistory.cpp diff --git a/dom/src/base/nsHistory.h b/dom/base/nsHistory.h similarity index 100% rename from dom/src/base/nsHistory.h rename to dom/base/nsHistory.h diff --git a/dom/public/nsIBaseDOMException.h b/dom/base/nsIBaseDOMException.h similarity index 100% rename from dom/public/nsIBaseDOMException.h rename to dom/base/nsIBaseDOMException.h diff --git a/dom/public/nsIDOMClassInfo.h b/dom/base/nsIDOMClassInfo.h similarity index 100% rename from dom/public/nsIDOMClassInfo.h rename to dom/base/nsIDOMClassInfo.h diff --git a/dom/public/nsIDOMScriptObjectFactory.h b/dom/base/nsIDOMScriptObjectFactory.h similarity index 100% rename from dom/public/nsIDOMScriptObjectFactory.h rename to dom/base/nsIDOMScriptObjectFactory.h diff --git a/dom/public/nsIEntropyCollector.idl b/dom/base/nsIEntropyCollector.idl similarity index 100% rename from dom/public/nsIEntropyCollector.idl rename to dom/base/nsIEntropyCollector.idl diff --git a/dom/public/base/nsIFocusController.h b/dom/base/nsIFocusController.h similarity index 100% rename from dom/public/base/nsIFocusController.h rename to dom/base/nsIFocusController.h diff --git a/dom/public/nsIJSEventListener.h b/dom/base/nsIJSEventListener.h similarity index 100% rename from dom/public/nsIJSEventListener.h rename to dom/base/nsIJSEventListener.h diff --git a/dom/public/nsIJSNativeInitializer.h b/dom/base/nsIJSNativeInitializer.h similarity index 100% rename from dom/public/nsIJSNativeInitializer.h rename to dom/base/nsIJSNativeInitializer.h diff --git a/dom/public/nsIScriptChannel.idl b/dom/base/nsIScriptChannel.idl similarity index 100% rename from dom/public/nsIScriptChannel.idl rename to dom/base/nsIScriptChannel.idl diff --git a/dom/public/nsIScriptContext.h b/dom/base/nsIScriptContext.h similarity index 100% rename from dom/public/nsIScriptContext.h rename to dom/base/nsIScriptContext.h diff --git a/dom/public/nsIScriptExternalNameSet.h b/dom/base/nsIScriptExternalNameSet.h similarity index 100% rename from dom/public/nsIScriptExternalNameSet.h rename to dom/base/nsIScriptExternalNameSet.h diff --git a/dom/public/nsIScriptGlobalObject.h b/dom/base/nsIScriptGlobalObject.h similarity index 100% rename from dom/public/nsIScriptGlobalObject.h rename to dom/base/nsIScriptGlobalObject.h diff --git a/dom/public/nsIScriptGlobalObjectOwner.h b/dom/base/nsIScriptGlobalObjectOwner.h similarity index 100% rename from dom/public/nsIScriptGlobalObjectOwner.h rename to dom/base/nsIScriptGlobalObjectOwner.h diff --git a/dom/public/nsIScriptNameSpaceManager.h b/dom/base/nsIScriptNameSpaceManager.h similarity index 100% rename from dom/public/nsIScriptNameSpaceManager.h rename to dom/base/nsIScriptNameSpaceManager.h diff --git a/dom/public/nsIScriptObjectOwner.h b/dom/base/nsIScriptObjectOwner.h similarity index 100% rename from dom/public/nsIScriptObjectOwner.h rename to dom/base/nsIScriptObjectOwner.h diff --git a/dom/public/nsIScriptObjectPrincipal.h b/dom/base/nsIScriptObjectPrincipal.h similarity index 100% rename from dom/public/nsIScriptObjectPrincipal.h rename to dom/base/nsIScriptObjectPrincipal.h diff --git a/dom/public/nsIScriptRuntime.h b/dom/base/nsIScriptRuntime.h similarity index 100% rename from dom/public/nsIScriptRuntime.h rename to dom/base/nsIScriptRuntime.h diff --git a/dom/public/nsIScriptTimeoutHandler.h b/dom/base/nsIScriptTimeoutHandler.h similarity index 100% rename from dom/public/nsIScriptTimeoutHandler.h rename to dom/base/nsIScriptTimeoutHandler.h diff --git a/dom/src/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp similarity index 100% rename from dom/src/base/nsJSEnvironment.cpp rename to dom/base/nsJSEnvironment.cpp diff --git a/dom/src/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h similarity index 100% rename from dom/src/base/nsJSEnvironment.h rename to dom/base/nsJSEnvironment.h diff --git a/dom/src/base/nsJSTimeoutHandler.cpp b/dom/base/nsJSTimeoutHandler.cpp similarity index 100% rename from dom/src/base/nsJSTimeoutHandler.cpp rename to dom/base/nsJSTimeoutHandler.cpp diff --git a/dom/src/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp similarity index 100% rename from dom/src/base/nsJSUtils.cpp rename to dom/base/nsJSUtils.cpp diff --git a/dom/src/base/nsJSUtils.h b/dom/base/nsJSUtils.h similarity index 100% rename from dom/src/base/nsJSUtils.h rename to dom/base/nsJSUtils.h diff --git a/dom/src/base/nsLocation.cpp b/dom/base/nsLocation.cpp similarity index 100% rename from dom/src/base/nsLocation.cpp rename to dom/base/nsLocation.cpp diff --git a/dom/src/base/nsMimeTypeArray.cpp b/dom/base/nsMimeTypeArray.cpp similarity index 100% rename from dom/src/base/nsMimeTypeArray.cpp rename to dom/base/nsMimeTypeArray.cpp diff --git a/dom/src/base/nsMimeTypeArray.h b/dom/base/nsMimeTypeArray.h similarity index 100% rename from dom/src/base/nsMimeTypeArray.h rename to dom/base/nsMimeTypeArray.h diff --git a/dom/public/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h similarity index 100% rename from dom/public/base/nsPIDOMWindow.h rename to dom/base/nsPIDOMWindow.h diff --git a/dom/public/base/nsPIWindowRoot.h b/dom/base/nsPIWindowRoot.h similarity index 100% rename from dom/public/base/nsPIWindowRoot.h rename to dom/base/nsPIWindowRoot.h diff --git a/dom/src/base/nsPluginArray.cpp b/dom/base/nsPluginArray.cpp similarity index 100% rename from dom/src/base/nsPluginArray.cpp rename to dom/base/nsPluginArray.cpp diff --git a/dom/src/base/nsPluginArray.h b/dom/base/nsPluginArray.h similarity index 100% rename from dom/src/base/nsPluginArray.h rename to dom/base/nsPluginArray.h diff --git a/dom/src/base/nsScreen.cpp b/dom/base/nsScreen.cpp similarity index 100% rename from dom/src/base/nsScreen.cpp rename to dom/base/nsScreen.cpp diff --git a/dom/src/base/nsScreen.h b/dom/base/nsScreen.h similarity index 100% rename from dom/src/base/nsScreen.h rename to dom/base/nsScreen.h diff --git a/dom/src/base/nsScriptNameSpaceManager.cpp b/dom/base/nsScriptNameSpaceManager.cpp similarity index 100% rename from dom/src/base/nsScriptNameSpaceManager.cpp rename to dom/base/nsScriptNameSpaceManager.cpp diff --git a/dom/src/base/nsScriptNameSpaceManager.h b/dom/base/nsScriptNameSpaceManager.h similarity index 100% rename from dom/src/base/nsScriptNameSpaceManager.h rename to dom/base/nsScriptNameSpaceManager.h diff --git a/dom/src/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp similarity index 100% rename from dom/src/base/nsWindowRoot.cpp rename to dom/base/nsWindowRoot.cpp diff --git a/dom/src/base/nsWindowRoot.h b/dom/base/nsWindowRoot.h similarity index 100% rename from dom/src/base/nsWindowRoot.h rename to dom/base/nsWindowRoot.h diff --git a/dom/public/nsWrapperCache.h b/dom/base/nsWrapperCache.h similarity index 100% rename from dom/public/nsWrapperCache.h rename to dom/base/nsWrapperCache.h diff --git a/dom/dom-config.mk b/dom/dom-config.mk new file mode 100644 index 000000000000..ca1a43722aa6 --- /dev/null +++ b/dom/dom-config.mk @@ -0,0 +1,69 @@ +MODULE = dom + +REQUIRES += \ + string \ + xpcom \ + webbrwsr \ + commandhandler \ + js \ + widget \ + gfx \ + thebes \ + layout \ + content \ + caps \ + docshell \ + xpconnect \ + pref \ + oji \ + necko \ + nkcache \ + mimetype \ + java \ + locale \ + prefetch \ + xuldoc \ + webshell \ + view \ + uconv \ + shistory \ + plugin \ + windowwatcher \ + chardet \ + find \ + appshell \ + intl \ + unicharutil \ + rdf \ + xultmpl \ + jar \ + storage \ + htmlparser \ + $(NULL) + +ifdef NS_TRACE_MALLOC +REQUIRES += tracemalloc +endif + +ifdef MOZ_JSDEBUGGER +REQUIRES += jsdebug +endif + +DOM_SRCDIRS = \ + dom/base \ + dom/src/events \ + dom/src/storage \ + dom/src/offline \ + dom/src/geolocation \ + dom/src/threads \ + content/xbl/src \ + content/xul/document/src \ + content/events/src \ + content/base/src \ + content/html/document/src \ + layout/style \ + layout/xul/base/src/tree/src \ + $(NULL) + +LOCAL_INCLUDES += $(DOM_SRCDIRS:%=-I$(topsrcdir)/%) +DEFINES += -D_IMPL_NS_LAYOUT diff --git a/dom/public/Makefile.in b/dom/public/Makefile.in deleted file mode 100644 index 484d1e06d303..000000000000 --- a/dom/public/Makefile.in +++ /dev/null @@ -1,77 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla 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/MPL/ -# -# 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 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 of 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 MPL, 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 MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = dom -GRE_MODULE = 1 - -DIRS = coreEvents base - -XPIDLSRCS = nsIEntropyCollector.idl \ - nsIScriptChannel.idl \ - $(NULL) - -EXPORTS=nsIScriptContext.h \ - nsIJSNativeInitializer.h \ - nsIScriptRuntime.h \ - nsIScriptObjectOwner.h \ - nsIScriptObjectPrincipal.h \ - nsIScriptGlobalObject.h \ - nsIScriptGlobalObjectOwner.h \ - nsIScriptTimeoutHandler.h \ - nsIDOMScriptObjectFactory.h \ - nsDOMCID.h \ - nsIScriptExternalNameSet.h \ - nsIScriptNameSpaceManager.h \ - nsDOMError.h \ - nsIJSEventListener.h \ - nsIDOMClassInfo.h \ - nsDOMClassInfoID.h \ - nsIBaseDOMException.h \ - nsDOMString.h \ - nsDOMJSUtils.h \ - nsDOMScriptObjectHolder.h \ - nsWrapperCache.h \ - $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/dom/public/base/Makefile.in b/dom/public/base/Makefile.in deleted file mode 100644 index 0f2e433af145..000000000000 --- a/dom/public/base/Makefile.in +++ /dev/null @@ -1,51 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla 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/MPL/ -# -# 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 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 of 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 MPL, 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 MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = dom - -EXPORTS=nsPIDOMWindow.h nsPIWindowRoot.h nsIFocusController.h - -include $(topsrcdir)/config/rules.mk - -DEFINES += -D_IMPL_NS_LAYOUT diff --git a/dom/src/Makefile.in b/dom/src/Makefile.in index eee5b0540c4d..a11de4914e35 100644 --- a/dom/src/Makefile.in +++ b/dom/src/Makefile.in @@ -42,7 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = base jsurl events storage offline json geolocation threads +DIRS = jsurl events storage offline json geolocation threads include $(topsrcdir)/config/rules.mk diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index 24dc15c53e1d..48ce288f5daa 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -67,5 +67,5 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -INCLUDES += -I$(srcdir)/../base +INCLUDES += -I$(topsrcdir)/dom/base diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index 438ab91049dd..10248966e386 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -73,7 +73,7 @@ EXTRA_DSO_LDOPTS = \ $(NULL) LOCAL_INCLUDES = \ - -I$(srcdir)/../base \ + -I$(topsrcdir)/dom/base \ $(NULL) ifdef NS_MAEMO_LOCATION diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index 1732a89560e7..958285f97415 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -75,7 +75,7 @@ EXPORTS = $(srcdir)/nsJSProtocolHandler.h LOCAL_INCLUDES += \ -I$(srcdir) \ - -I$(srcdir)/../base \ + -I$(topsrcdir)/dom/base \ EXTRA_DSO_LDOPTS = \ $(MOZ_COMPONENT_LIBS) \ diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in index 27666c296c30..d30d730cbf07 100644 --- a/dom/src/offline/Makefile.in +++ b/dom/src/offline/Makefile.in @@ -72,7 +72,7 @@ CPPSRCS = \ FORCE_STATIC_LIB = 1 LOCAL_INCLUDES = \ - -I$(srcdir)/../base \ + -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index afe1e59b66fa..1cafc3675dd7 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -79,7 +79,7 @@ endif FORCE_STATIC_LIB = 1 LOCAL_INCLUDES = \ - -I$(srcdir)/../base \ + -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/events/src DEFINES += -D_IMPL_NS_LAYOUT diff --git a/dom/src/threads/Makefile.in b/dom/src/threads/Makefile.in index da5fa542e44b..aa620c58f344 100644 --- a/dom/src/threads/Makefile.in +++ b/dom/src/threads/Makefile.in @@ -82,7 +82,7 @@ CPPSRCS = \ $(NULL) LOCAL_INCLUDES = \ - -I$(topsrcdir)/dom/src/base \ + -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/src/json \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 71d7ec64d3c9..a70955ef8b8d 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -178,7 +178,7 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../../content/events/src \ -I$(srcdir)/../../content/xbl/src \ -I$(srcdir)/../../view/src \ - -I$(srcdir)/../../dom/src/base \ + -I$(srcdir)/../../dom/base \ -I$(srcdir)/../../content/svg/content/src \ $(NULL) diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 3b6080ca0637..5960fe133f47 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -129,7 +129,7 @@ SHARED_LIBRARY_LIBS = \ $(DEPTH)/content/xbl/src/$(LIB_PREFIX)gkconxbl_s.$(LIB_SUFFIX) \ $(DEPTH)/content/xul/document/src/$(LIB_PREFIX)gkconxuldoc_s.$(LIB_SUFFIX) \ $(DEPTH)/view/src/$(LIB_PREFIX)gkview_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/src/base/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \ + $(DEPTH)/dom/base/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \ $(DEPTH)/dom/src/events/$(LIB_PREFIX)jsdomevents_s.$(LIB_SUFFIX) \ $(DEPTH)/dom/src/json/$(LIB_PREFIX)json_s.$(LIB_SUFFIX) \ $(DEPTH)/dom/src/jsurl/$(LIB_PREFIX)jsurl_s.$(LIB_SUFFIX) \ @@ -298,7 +298,7 @@ LOCAL_INCLUDES += -I$(srcdir)/../base \ -I$(topsrcdir)/content/events/src \ -I$(topsrcdir)/content/xbl/src \ -I$(topsrcdir)/view/src \ - -I$(topsrcdir)/dom/src/base \ + -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/src/json \ -I$(topsrcdir)/dom/src/jsurl \ -I$(topsrcdir)/dom/src/storage \ diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 403e1483fc64..cc790972714d 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -187,7 +187,7 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../../content/xul/content/src \ -I$(srcdir)/../../content/base/src \ -I$(srcdir)/../../content/html/content/src \ - -I$(srcdir)/../../dom/src/base \ + -I$(srcdir)/../../dom/base \ $(MOZ_CAIRO_CFLAGS) \ $(NULL) diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list index 407203a0b85a..988ca1c958c7 100644 --- a/testing/crashtest/crashtests.list +++ b/testing/crashtest/crashtests.list @@ -21,7 +21,7 @@ include ../../content/media/video/test/crashtests/crashtests.list include ../../docshell/base/crashtests/crashtests.list -include ../../dom/src/base/crashtests/crashtests.list +include ../../dom/base/crashtests/crashtests.list include ../../dom/src/offline/crashtests/crashtests.list include ../../dom/src/jsurl/crashtests/crashtests.list diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index d6690b7d6368..5a54411ba834 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -49,8 +49,6 @@ MAKEFILES_db=" MAKEFILES_dom=" dom/Makefile - dom/public/Makefile - dom/public/base/Makefile dom/public/coreEvents/Makefile dom/interfaces/base/Makefile dom/interfaces/canvas/Makefile @@ -64,8 +62,8 @@ MAKEFILES_dom=" dom/interfaces/xbl/Makefile dom/interfaces/xpath/Makefile dom/interfaces/xul/Makefile + dom/base/Makefile dom/src/Makefile - dom/src/base/Makefile dom/src/events/Makefile dom/src/jsurl/Makefile dom/locales/Makefile