From 0d7a67caac1d0e5e7df317bf5f32fcda74344536 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Wed, 8 Nov 2000 03:22:03 +0000 Subject: [PATCH] Release static nsDOMScriptObjectFactory, nsBoxLayout, and nsRepeatService in layout module destructor. r=jst@netscape.com b=43576 r=evaughan@netscape.com b=43582,43588 sr=brendan@mozilla.org git-svn-id: svn://10.0.0.236/trunk@82420 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/build/Makefile.in | 4 +++- mozilla/layout/build/makefile.win | 1 + mozilla/layout/build/nsLayoutModule.cpp | 19 +++++++++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index aaebacd4341..99672c195d9 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -105,7 +105,9 @@ DEFINES += -D_IMPL_NS_HTML INCLUDES += -I$(srcdir)/../base/src \ -I$(srcdir)/../html/base/src \ - -I$(srcdir)/../xul/content/src + -I$(srcdir)/../xul/content/src \ + -I$(srcdir)/../xul/base/src \ + $(NULL) ifdef MOZ_MATHML INCLUDES += -I$(srcdir)/../mathml/content/src diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win index aa68a290e9c..579338b3e8a 100644 --- a/mozilla/layout/build/makefile.win +++ b/mozilla/layout/build/makefile.win @@ -53,6 +53,7 @@ LCFLAGS = \ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\dom \ -I$(PUBLIC)\js -I..\..\style\src -I..\html\base\src -I..\base\src \ -I..\xul\content\src \ + -I..\xul\base\src \ !ifdef MOZ_MATHML -I..\mathml\content\src \ !endif diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index 82e54f8ef36..701b29e792f 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -69,6 +69,13 @@ #include "nsTextTransformer.h" #include "nsRange.h" +#include "nsGenericElement.h" +#ifdef INCLUDE_XUL +#include "nsBulletinBoardLayout.h" +#include "nsRepeatService.h" +#include "nsSprocketLayout.h" +#include "nsStackLayout.h" +#endif #include "nsIHTTPProtocolHandler.h" #include "gbdate.h" #include "nsContentPolicyUtils.h" @@ -254,6 +261,16 @@ nsLayoutModule::Shutdown() if (!mInitialized) { return; } + +#ifdef INCLUDE_XUL + nsBulletinBoardLayout::Shutdown(); + nsRepeatService::Shutdown(); + nsSprocketLayout::Shutdown(); + nsStackLayout::Shutdown(); +#endif + + nsRange::Shutdown(); + nsGenericElement::Shutdown(); // Release all of our atoms nsColorNames::ReleaseTable(); @@ -277,8 +294,6 @@ nsLayoutModule::Shutdown() nsTextTransformer::Shutdown(); - nsRange::Shutdown(); - NS_IF_RELEASE(gRegistry); NS_IF_RELEASE(gUAStyleSheet); }