mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Bug 13252. Build content for current template before recursing to build content for children. r=alecf.
This commit is contained in:
parent
96ad89ba3a
commit
d2c5bedf2e
@ -721,6 +721,17 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
|
||||
|
||||
nsresult rv;
|
||||
|
||||
// Create the current resource's contents from the template, if
|
||||
// appropriate
|
||||
nsAutoString templateID;
|
||||
rv = aElement->GetAttribute(kNameSpaceID_None, kTemplateAtom, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
|
||||
rv = CreateTemplateContents(aElement, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIRDFResource> resource;
|
||||
rv = gXULUtils->GetElementRefResource(aElement, getter_AddRefs(resource));
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
@ -731,16 +742,6 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
nsAutoString templateID;
|
||||
rv = aElement->GetAttribute(kNameSpaceID_None, kTemplateAtom, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
// Hmm, this isn't a template node after all. Not sure _what_ it is.
|
||||
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
|
||||
rv = CreateTemplateContents(aElement, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -721,6 +721,17 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
|
||||
|
||||
nsresult rv;
|
||||
|
||||
// Create the current resource's contents from the template, if
|
||||
// appropriate
|
||||
nsAutoString templateID;
|
||||
rv = aElement->GetAttribute(kNameSpaceID_None, kTemplateAtom, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
|
||||
rv = CreateTemplateContents(aElement, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIRDFResource> resource;
|
||||
rv = gXULUtils->GetElementRefResource(aElement, getter_AddRefs(resource));
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
@ -731,16 +742,6 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
nsAutoString templateID;
|
||||
rv = aElement->GetAttribute(kNameSpaceID_None, kTemplateAtom, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
// Hmm, this isn't a template node after all. Not sure _what_ it is.
|
||||
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
|
||||
rv = CreateTemplateContents(aElement, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -721,6 +721,17 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
|
||||
|
||||
nsresult rv;
|
||||
|
||||
// Create the current resource's contents from the template, if
|
||||
// appropriate
|
||||
nsAutoString templateID;
|
||||
rv = aElement->GetAttribute(kNameSpaceID_None, kTemplateAtom, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
|
||||
rv = CreateTemplateContents(aElement, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIRDFResource> resource;
|
||||
rv = gXULUtils->GetElementRefResource(aElement, getter_AddRefs(resource));
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
@ -731,16 +742,6 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
nsAutoString templateID;
|
||||
rv = aElement->GetAttribute(kNameSpaceID_None, kTemplateAtom, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
// Hmm, this isn't a template node after all. Not sure _what_ it is.
|
||||
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
|
||||
rv = CreateTemplateContents(aElement, templateID);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user