mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
Removed tree-specific open and close code. This is now in the nsRDFTreeBuilder, where it belongs.
This commit is contained in:
parent
28ca9cc805
commit
c9a1447694
@ -257,7 +257,6 @@ private:
|
||||
static PRInt32 kNameSpaceID_XUL;
|
||||
static nsIAtom* kIdAtom;
|
||||
static nsIAtom* kContainerAtom;
|
||||
static nsIAtom* kOpenAtom;
|
||||
|
||||
nsIDocument* mDocument;
|
||||
void* mScriptObject;
|
||||
@ -280,7 +279,6 @@ nsIRDFService* RDFElementImpl::gRDFService;
|
||||
nsINameSpaceManager* RDFElementImpl::gNameSpaceManager;
|
||||
nsIAtom* RDFElementImpl::kIdAtom;
|
||||
nsIAtom* RDFElementImpl::kContainerAtom;
|
||||
nsIAtom* RDFElementImpl::kOpenAtom;
|
||||
PRInt32 RDFElementImpl::kNameSpaceID_RDF;
|
||||
PRInt32 RDFElementImpl::kNameSpaceID_XUL;
|
||||
|
||||
@ -313,7 +311,6 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
|
||||
|
||||
kIdAtom = NS_NewAtom("id");
|
||||
kContainerAtom = NS_NewAtom("container");
|
||||
kOpenAtom = NS_NewAtom("open");
|
||||
|
||||
rv = nsRepository::CreateInstance(kNameSpaceManagerCID,
|
||||
nsnull,
|
||||
@ -362,7 +359,6 @@ RDFElementImpl::~RDFElementImpl()
|
||||
|
||||
NS_IF_RELEASE(kIdAtom);
|
||||
NS_IF_RELEASE(kContainerAtom);
|
||||
NS_IF_RELEASE(kOpenAtom);
|
||||
NS_IF_RELEASE(gNameSpaceManager);
|
||||
}
|
||||
}
|
||||
@ -1647,18 +1643,6 @@ RDFElementImpl::SetAttribute(PRInt32 aNameSpaceID,
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
}
|
||||
|
||||
// See if they're opening or closing the element.
|
||||
if ((aNameSpaceID == kNameSpaceID_None) && (aName == kOpenAtom)) {
|
||||
if (aValue.EqualsIgnoreCase("true")) {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
rv = EnsureContentsGenerated();
|
||||
}
|
||||
else {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
NS_IF_RELEASE(mChildren);
|
||||
}
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
@ -1814,13 +1798,6 @@ RDFElementImpl::UnsetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNot
|
||||
}
|
||||
|
||||
// End XUL Only Code
|
||||
|
||||
// See if they're closing the element.
|
||||
if ((aNameSpaceID == kNameSpaceID_None) && (aName == kOpenAtom)) {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
NS_IF_RELEASE(mChildren);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
@ -257,7 +257,6 @@ private:
|
||||
static PRInt32 kNameSpaceID_XUL;
|
||||
static nsIAtom* kIdAtom;
|
||||
static nsIAtom* kContainerAtom;
|
||||
static nsIAtom* kOpenAtom;
|
||||
|
||||
nsIDocument* mDocument;
|
||||
void* mScriptObject;
|
||||
@ -280,7 +279,6 @@ nsIRDFService* RDFElementImpl::gRDFService;
|
||||
nsINameSpaceManager* RDFElementImpl::gNameSpaceManager;
|
||||
nsIAtom* RDFElementImpl::kIdAtom;
|
||||
nsIAtom* RDFElementImpl::kContainerAtom;
|
||||
nsIAtom* RDFElementImpl::kOpenAtom;
|
||||
PRInt32 RDFElementImpl::kNameSpaceID_RDF;
|
||||
PRInt32 RDFElementImpl::kNameSpaceID_XUL;
|
||||
|
||||
@ -313,7 +311,6 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
|
||||
|
||||
kIdAtom = NS_NewAtom("id");
|
||||
kContainerAtom = NS_NewAtom("container");
|
||||
kOpenAtom = NS_NewAtom("open");
|
||||
|
||||
rv = nsRepository::CreateInstance(kNameSpaceManagerCID,
|
||||
nsnull,
|
||||
@ -362,7 +359,6 @@ RDFElementImpl::~RDFElementImpl()
|
||||
|
||||
NS_IF_RELEASE(kIdAtom);
|
||||
NS_IF_RELEASE(kContainerAtom);
|
||||
NS_IF_RELEASE(kOpenAtom);
|
||||
NS_IF_RELEASE(gNameSpaceManager);
|
||||
}
|
||||
}
|
||||
@ -1647,18 +1643,6 @@ RDFElementImpl::SetAttribute(PRInt32 aNameSpaceID,
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
}
|
||||
|
||||
// See if they're opening or closing the element.
|
||||
if ((aNameSpaceID == kNameSpaceID_None) && (aName == kOpenAtom)) {
|
||||
if (aValue.EqualsIgnoreCase("true")) {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
rv = EnsureContentsGenerated();
|
||||
}
|
||||
else {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
NS_IF_RELEASE(mChildren);
|
||||
}
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
@ -1814,13 +1798,6 @@ RDFElementImpl::UnsetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNot
|
||||
}
|
||||
|
||||
// End XUL Only Code
|
||||
|
||||
// See if they're closing the element.
|
||||
if ((aNameSpaceID == kNameSpaceID_None) && (aName == kOpenAtom)) {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
NS_IF_RELEASE(mChildren);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
@ -257,7 +257,6 @@ private:
|
||||
static PRInt32 kNameSpaceID_XUL;
|
||||
static nsIAtom* kIdAtom;
|
||||
static nsIAtom* kContainerAtom;
|
||||
static nsIAtom* kOpenAtom;
|
||||
|
||||
nsIDocument* mDocument;
|
||||
void* mScriptObject;
|
||||
@ -280,7 +279,6 @@ nsIRDFService* RDFElementImpl::gRDFService;
|
||||
nsINameSpaceManager* RDFElementImpl::gNameSpaceManager;
|
||||
nsIAtom* RDFElementImpl::kIdAtom;
|
||||
nsIAtom* RDFElementImpl::kContainerAtom;
|
||||
nsIAtom* RDFElementImpl::kOpenAtom;
|
||||
PRInt32 RDFElementImpl::kNameSpaceID_RDF;
|
||||
PRInt32 RDFElementImpl::kNameSpaceID_XUL;
|
||||
|
||||
@ -313,7 +311,6 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
|
||||
|
||||
kIdAtom = NS_NewAtom("id");
|
||||
kContainerAtom = NS_NewAtom("container");
|
||||
kOpenAtom = NS_NewAtom("open");
|
||||
|
||||
rv = nsRepository::CreateInstance(kNameSpaceManagerCID,
|
||||
nsnull,
|
||||
@ -362,7 +359,6 @@ RDFElementImpl::~RDFElementImpl()
|
||||
|
||||
NS_IF_RELEASE(kIdAtom);
|
||||
NS_IF_RELEASE(kContainerAtom);
|
||||
NS_IF_RELEASE(kOpenAtom);
|
||||
NS_IF_RELEASE(gNameSpaceManager);
|
||||
}
|
||||
}
|
||||
@ -1647,18 +1643,6 @@ RDFElementImpl::SetAttribute(PRInt32 aNameSpaceID,
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
}
|
||||
|
||||
// See if they're opening or closing the element.
|
||||
if ((aNameSpaceID == kNameSpaceID_None) && (aName == kOpenAtom)) {
|
||||
if (aValue.EqualsIgnoreCase("true")) {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
rv = EnsureContentsGenerated();
|
||||
}
|
||||
else {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
NS_IF_RELEASE(mChildren);
|
||||
}
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
@ -1814,13 +1798,6 @@ RDFElementImpl::UnsetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNot
|
||||
}
|
||||
|
||||
// End XUL Only Code
|
||||
|
||||
// See if they're closing the element.
|
||||
if ((aNameSpaceID == kNameSpaceID_None) && (aName == kOpenAtom)) {
|
||||
mContentsMustBeGenerated = PR_TRUE;
|
||||
NS_IF_RELEASE(mChildren);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user