Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix HTML-rooted templates.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@47628 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com 1999-09-15 20:08:37 +00:00
parent f0f6384861
commit 16632ee9c4
3 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
View File

@ -2083,24 +2083,29 @@ RDFGenericBuilderImpl::CreateContainerContents(nsIContent* aElement, nsIRDFResou
// See if the element's templates contents have been generated:
// this prevents a re-entrant call from triggering another
// generation.
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
PRBool contentsGenerated;
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_THERE;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = xulcontent->SetLazyState(nsIXULContent::eContainerContentsBuilt);
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
// HTML is always needs to be generated.
//
// XXX Big ass-umption here -- I am assuming that this will
// _only_ ever get called (in the case of an HTML element)
// when the XUL builder is descending thru the graph and
// stumbles on a template that is rooted at an HTML element.
// (/me crosses fingers...)
}
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_THERE;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = xulcontent->SetLazyState(nsIXULContent::eContainerContentsBuilt);
// XXX Eventually, we may want to factor this into one method that
// handles RDF containers (RDF:Bag, et al.) and another that
// handles multi-attributes. For performance...

25
mozilla/rdf/content/src/nsRDFGenericBuilder.cpp
View File

@ -2083,24 +2083,29 @@ RDFGenericBuilderImpl::CreateContainerContents(nsIContent* aElement, nsIRDFResou
// See if the element's templates contents have been generated:
// this prevents a re-entrant call from triggering another
// generation.
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
PRBool contentsGenerated;
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_THERE;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = xulcontent->SetLazyState(nsIXULContent::eContainerContentsBuilt);
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
// HTML is always needs to be generated.
//
// XXX Big ass-umption here -- I am assuming that this will
// _only_ ever get called (in the case of an HTML element)
// when the XUL builder is descending thru the graph and
// stumbles on a template that is rooted at an HTML element.
// (/me crosses fingers...)
}
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_THERE;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = xulcontent->SetLazyState(nsIXULContent::eContainerContentsBuilt);
// XXX Eventually, we may want to factor this into one method that
// handles RDF containers (RDF:Bag, et al.) and another that
// handles multi-attributes. For performance...

25
mozilla/rdf/content/src/nsXULTemplateBuilder.cpp
View File

@ -2083,24 +2083,29 @@ RDFGenericBuilderImpl::CreateContainerContents(nsIContent* aElement, nsIRDFResou
// See if the element's templates contents have been generated:
// this prevents a re-entrant call from triggering another
// generation.
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
PRBool contentsGenerated;
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_THERE;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = xulcontent->SetLazyState(nsIXULContent::eContainerContentsBuilt);
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
// HTML is always needs to be generated.
//
// XXX Big ass-umption here -- I am assuming that this will
// _only_ ever get called (in the case of an HTML element)
// when the XUL builder is descending thru the graph and
// stumbles on a template that is rooted at an HTML element.
// (/me crosses fingers...)
}
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_THERE;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = xulcontent->SetLazyState(nsIXULContent::eContainerContentsBuilt);
// XXX Eventually, we may want to factor this into one method that
// handles RDF containers (RDF:Bag, et al.) and another that
// handles multi-attributes. For performance...