mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-11 16:32:59 +00:00
load XUL atoms on XML document creation
This commit is contained in:
parent
d42a3de04b
commit
673e89c4af
@ -34,6 +34,7 @@ INCLUDES += \
|
||||
-I$(srcdir)/../../../html/content/src \
|
||||
-I$(srcdir)/../../../html/style/src \
|
||||
-I$(srcdir)/../../../base/src \
|
||||
-I$(srcdir)/../../../xul/content/src \
|
||||
-I$(DIST)/public/raptor \
|
||||
$(NULL)
|
||||
|
||||
|
@ -39,6 +39,7 @@ EXPORTS = \
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
|
||||
-I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
|
||||
-I..\..\..\html\content\src -I..\..\..\html\document\src \
|
||||
-I..\..\..\xul\content\src \
|
||||
-I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref
|
||||
|
||||
LCFLAGS = \
|
||||
|
@ -41,6 +41,9 @@
|
||||
|
||||
// XXX The XML world depends on the html atoms
|
||||
#include "nsHTMLAtoms.h"
|
||||
#ifdef INCLUDE_XUL
|
||||
#include "nsXULAtoms.h"
|
||||
#endif
|
||||
|
||||
static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
|
||||
static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
|
||||
@ -156,6 +159,10 @@ nsXMLDocument::nsXMLDocument()
|
||||
|
||||
// XXX The XML world depends on the html atoms
|
||||
nsHTMLAtoms::AddrefAtoms();
|
||||
#ifdef INCLUDE_XUL
|
||||
// XUL world lives within XML world until it gets a place of its own
|
||||
nsXULAtoms::AddrefAtoms();
|
||||
#endif
|
||||
}
|
||||
|
||||
nsXMLDocument::~nsXMLDocument()
|
||||
@ -188,6 +195,9 @@ nsXMLDocument::~nsXMLDocument()
|
||||
delete mEpilog;
|
||||
}
|
||||
NS_IF_RELEASE(mChildNodes);
|
||||
#ifdef INCLUDE_XUL
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
#endif
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
@ -34,6 +34,7 @@ INCLUDES += \
|
||||
-I$(srcdir)/../../../html/content/src \
|
||||
-I$(srcdir)/../../../html/style/src \
|
||||
-I$(srcdir)/../../../base/src \
|
||||
-I$(srcdir)/../../../xul/content/src \
|
||||
-I$(DIST)/public/raptor \
|
||||
$(NULL)
|
||||
|
||||
|
@ -39,6 +39,7 @@ EXPORTS = \
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
|
||||
-I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
|
||||
-I..\..\..\html\content\src -I..\..\..\html\document\src \
|
||||
-I..\..\..\xul\content\src \
|
||||
-I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref
|
||||
|
||||
LCFLAGS = \
|
||||
|
@ -41,6 +41,9 @@
|
||||
|
||||
// XXX The XML world depends on the html atoms
|
||||
#include "nsHTMLAtoms.h"
|
||||
#ifdef INCLUDE_XUL
|
||||
#include "nsXULAtoms.h"
|
||||
#endif
|
||||
|
||||
static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
|
||||
static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
|
||||
@ -156,6 +159,10 @@ nsXMLDocument::nsXMLDocument()
|
||||
|
||||
// XXX The XML world depends on the html atoms
|
||||
nsHTMLAtoms::AddrefAtoms();
|
||||
#ifdef INCLUDE_XUL
|
||||
// XUL world lives within XML world until it gets a place of its own
|
||||
nsXULAtoms::AddrefAtoms();
|
||||
#endif
|
||||
}
|
||||
|
||||
nsXMLDocument::~nsXMLDocument()
|
||||
@ -188,6 +195,9 @@ nsXMLDocument::~nsXMLDocument()
|
||||
delete mEpilog;
|
||||
}
|
||||
NS_IF_RELEASE(mChildNodes);
|
||||
#ifdef INCLUDE_XUL
|
||||
nsXULAtoms::ReleaseAtoms();
|
||||
#endif
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
Loading…
Reference in New Issue
Block a user