mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Performance improvements. Make use of CBufDescriptor's where appropriate; replace attribute-based lazy bookkeeping with a private interface (non-XUL content can't be lazy, _anyway_).

This commit is contained in:
waterson%netscape.com 1999-09-13 22:06:17 +00:00
Родитель e68d1186bc
Коммит 06ea3cca41
11 изменённых файлов: 668 добавлений и 660 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

99
content/xul/content/src/nsXULElement.cpp
Просмотреть файл

@ -331,6 +331,9 @@ public:
// nsIXULContent
NS_IMETHOD PeekChildCount(PRInt32& aCount) const;
NS_IMETHOD SetLazyState(PRInt32 aFlags);
NS_IMETHOD ClearLazyState(PRInt32 aFlags);
NS_IMETHOD GetLazyState(PRInt32 aFlag, PRBool& aValue);
// nsIDOMEventReceiver
NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
@ -420,7 +423,6 @@ private:
static nsIAtom* kRefAtom;
static nsIAtom* kClassAtom;
static nsIAtom* kStyleAtom;
static nsIAtom* kLazyContentAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeItemAtom;
@ -451,7 +453,6 @@ private:
nsIAtom* mTag; // [OWNER]
nsIEventListenerManager* mListenerManager; // [OWNER]
nsXULAttributes* mAttributes; // [OWNER]
PRBool mContentsMustBeGenerated;
nsVoidArray* mBroadcastListeners; // [WEAK]
nsIDOMXULElement* mBroadcaster; // [WEAK]
nsIController* mController; // [OWNER]
@ -460,6 +461,9 @@ private:
// An unreferenced bare pointer to an aggregate that can implement
// element-specific APIs.
nsXULElement* mInnerXULElement;
// The state of our sloth; see nsIXULContent.
PRInt32 mLazyState;
};
@ -471,7 +475,6 @@ nsIAtom* RDFElementImpl::kIdAtom;
nsIAtom* RDFElementImpl::kRefAtom;
nsIAtom* RDFElementImpl::kClassAtom;
nsIAtom* RDFElementImpl::kStyleAtom;
nsIAtom* RDFElementImpl::kLazyContentAtom;
nsIAtom* RDFElementImpl::kTreeAtom;
nsIAtom* RDFElementImpl::kTreeItemAtom;
nsIAtom* RDFElementImpl::kTreeRowAtom;
@ -552,11 +555,11 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
mTag(aTag),
mListenerManager(nsnull),
mAttributes(nsnull),
mContentsMustBeGenerated(PR_FALSE),
mBroadcastListeners(nsnull),
mBroadcaster(nsnull),
mController(nsnull),
mInnerXULElement(nsnull)
mInnerXULElement(nsnull),
mLazyState(0)
{
NS_INIT_REFCNT();
NS_ADDREF(aTag);
@ -573,7 +576,6 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
kRefAtom = NS_NewAtom("ref");
kClassAtom = NS_NewAtom("class");
kStyleAtom = NS_NewAtom("style");
kLazyContentAtom = NS_NewAtom("lazycontent");
kTreeAtom = NS_NewAtom("tree");
kTreeItemAtom = NS_NewAtom("treeitem");
kTreeRowAtom = NS_NewAtom("treerow");
@ -663,7 +665,6 @@ RDFElementImpl::~RDFElementImpl()
NS_IF_RELEASE(kRefAtom);
NS_IF_RELEASE(kClassAtom);
NS_IF_RELEASE(kStyleAtom);
NS_IF_RELEASE(kLazyContentAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeItemAtom);
NS_IF_RELEASE(kTreeRowAtom);
@ -1448,6 +1449,28 @@ RDFElementImpl::PeekChildCount(PRInt32& aCount) const
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::SetLazyState(PRInt32 aFlags)
{
mLazyState |= aFlags;
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::ClearLazyState(PRInt32 aFlags)
{
mLazyState &= ~aFlags;
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::GetLazyState(PRInt32 aFlag, PRBool& aResult)
{
aResult = (mLazyState & aFlag) ? PR_TRUE : PR_FALSE;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
// nsIDOMEventReceiver interface
@ -2410,15 +2433,6 @@ RDFElementImpl::SetAttribute(PRInt32 aNameSpaceID,
mDocument->AttributeChanged(NS_STATIC_CAST(nsIStyledContent*, this), aName, NS_STYLE_HINT_UNKNOWN);
}
// Check to see if this is the RDF:container property; if so, and
// the value is "true", then remember to generate our kids on
// demand.
if ((aNameSpaceID == kNameSpaceID_None) &&
(aName == kLazyContentAtom) &&
(aValue.EqualsIgnoreCase("true"))) {
mContentsMustBeGenerated = PR_TRUE;
}
return rv;
}
@ -3123,38 +3137,37 @@ RDFElementImpl::GetRefResource(nsIRDFResource** aResource)
nsresult
RDFElementImpl::EnsureContentsGenerated(void) const
{
if (! mContentsMustBeGenerated)
return NS_OK;
if (mLazyState & nsIXULContent::eChildrenMustBeRebuilt) {
nsresult rv;
nsresult rv;
// Ensure that the element is actually _in_ the document tree;
// otherwise, somebody is trying to generate children for a node
// that's not currently in the content model.
NS_PRECONDITION(mDocument != nsnull, "element not in tree");
if (!mDocument)
return NS_ERROR_NOT_INITIALIZED;
// Ensure that the element is actually _in_ the document tree;
// otherwise, somebody is trying to generate children for a node
// that's not currently in the content model.
NS_PRECONDITION(mDocument != nsnull, "element not in tree");
if (!mDocument)
return NS_ERROR_NOT_INITIALIZED;
// XXX hack because we can't use "mutable"
RDFElementImpl* unconstThis = NS_CONST_CAST(RDFElementImpl*, this);
// XXX hack because we can't use "mutable"
RDFElementImpl* unconstThis = NS_CONST_CAST(RDFElementImpl*, this);
if (! unconstThis->mChildren) {
if (NS_FAILED(rv = NS_NewISupportsArray(&unconstThis->mChildren)))
return rv;
}
if (! unconstThis->mChildren) {
if (NS_FAILED(rv = NS_NewISupportsArray(&unconstThis->mChildren)))
return rv;
// Clear this value *first*, so we can re-enter the nsIContent
// getters if needed.
unconstThis->mLazyState &= ~nsIXULContent::eChildrenMustBeRebuilt;
nsCOMPtr<nsIRDFDocument> rdfDoc = do_QueryInterface(mDocument);
if (! mDocument)
return NS_OK;
rv = rdfDoc->CreateContents(NS_STATIC_CAST(nsIStyledContent*, unconstThis));
NS_ASSERTION(NS_SUCCEEDED(rv), "problem creating kids");
if (NS_FAILED(rv)) return rv;
}
// Clear this value *first*, so we can re-enter the nsIContent
// getters if needed.
unconstThis->mContentsMustBeGenerated = PR_FALSE;
nsCOMPtr<nsIRDFDocument> rdfDoc;
if (NS_FAILED(rv = mDocument->QueryInterface(kIRDFDocumentIID,
(void**) getter_AddRefs(rdfDoc))))
return rv;
rv = rdfDoc->CreateContents(NS_STATIC_CAST(nsIStyledContent*, unconstThis));
NS_ASSERTION(NS_SUCCEEDED(rv), "problem creating kids");
return rv;
return NS_OK;
}

4
content/xul/document/src/nsXULDocument.cpp
Просмотреть файл

@ -852,7 +852,6 @@ protected:
static PRInt32 gRefCnt;
static nsIAtom* kContainerContentsGeneratedAtom;
static nsIAtom* kIdAtom;
static nsIAtom* kLazyContentAtom;
static nsIAtom* kObservesAtom;
static nsIAtom* kOpenAtom;
static nsIAtom* kPersistAtom;
@ -942,7 +941,6 @@ protected:
PRInt32 XULDocumentImpl::gRefCnt = 0;
nsIAtom* XULDocumentImpl::kContainerContentsGeneratedAtom;
nsIAtom* XULDocumentImpl::kIdAtom;
nsIAtom* XULDocumentImpl::kLazyContentAtom;
nsIAtom* XULDocumentImpl::kObservesAtom;
nsIAtom* XULDocumentImpl::kOpenAtom;
nsIAtom* XULDocumentImpl::kPersistAtom;
@ -990,7 +988,6 @@ XULDocumentImpl::XULDocumentImpl(void)
if (gRefCnt++ == 0) {
kContainerContentsGeneratedAtom = NS_NewAtom("containercontentsgenerated");
kIdAtom = NS_NewAtom("id");
kLazyContentAtom = NS_NewAtom("lazycontent");
kObservesAtom = NS_NewAtom("observes");
kOpenAtom = NS_NewAtom("open");
kPersistAtom = NS_NewAtom("persist");
@ -1103,7 +1100,6 @@ XULDocumentImpl::~XULDocumentImpl()
if (--gRefCnt == 0) {
NS_IF_RELEASE(kContainerContentsGeneratedAtom);
NS_IF_RELEASE(kIdAtom);
NS_IF_RELEASE(kLazyContentAtom);
NS_IF_RELEASE(kObservesAtom);
NS_IF_RELEASE(kOpenAtom);
NS_IF_RELEASE(kPersistAtom);

7
content/xul/templates/src/nsXULContentUtils.cpp
Просмотреть файл

@ -345,7 +345,9 @@ nsXULContentUtils::GetElementResource(nsIContent* aElement, nsIRDFResource** aRe
// Perform a reverse mapping from an element in the content model
// to an RDF resource.
nsresult rv;
nsAutoString id;
PRUnichar buf[128];
nsAutoString id(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
nsCOMPtr<nsIAtom> kIdAtom( dont_AddRef(NS_NewAtom("id")) );
rv = aElement->GetAttribute(kNameSpaceID_None, kIdAtom, id);
@ -379,7 +381,8 @@ nsXULContentUtils::GetElementRefResource(nsIContent* aElement, nsIRDFResource**
// to an RDF resource. Check for a "ref" attribute first, then
// fallback on an "id" attribute.
nsresult rv;
nsAutoString uri;
PRUnichar buf[128];
nsAutoString uri(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
nsCOMPtr<nsIAtom> kIdAtom( dont_AddRef(NS_NewAtom("ref")) );
rv = aElement->GetAttribute(kNameSpaceID_None, kIdAtom, uri);

333
content/xul/templates/src/nsXULTemplateBuilder.cpp
Просмотреть файл

@ -62,6 +62,7 @@
#include "nsIXULSortService.h"
#include "nsLayoutCID.h"
#include "nsRDFCID.h"
#include "nsIXULContent.h"
#include "nsIXULContentUtils.h"
#include "nsString.h"
#include "nsVoidArray.h"
@ -169,9 +170,8 @@ public:
IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtom);
nsresult
GetSubstitutionText(nsIRDFResource* aResource,
const nsString& aSubstitution,
nsString& aResult);
SubstituteText(nsIRDFResource* aResource,
nsString& aAttributeValue);
nsresult
BuildContentFromTemplate(nsIContent *aTemplateNode,
@ -280,7 +280,6 @@ protected:
static nsIXULContentUtils* gXULUtils;
static nsIAtom* kContainerAtom;
static nsIAtom* kContainerContentsGeneratedAtom;
static nsIAtom* kContainmentAtom;
static nsIAtom* kEmptyAtom;
static nsIAtom* kIdAtom;
@ -288,7 +287,6 @@ protected:
static nsIAtom* kInstanceOfAtom;
static nsIAtom* kIsContainerAtom;
static nsIAtom* kIsEmptyAtom;
static nsIAtom* kLazyContentAtom;
static nsIAtom* kNaturalOrderPosAtom;
static nsIAtom* kOpenAtom;
static nsIAtom* kPersistAtom;
@ -297,7 +295,6 @@ protected:
static nsIAtom* kResourceAtom;
static nsIAtom* kRuleAtom;
static nsIAtom* kTemplateAtom;
static nsIAtom* kTemplateContentsGeneratedAtom;
static nsIAtom* kTextAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeChildrenAtom;
@ -326,7 +323,6 @@ nsrefcnt RDFGenericBuilderImpl::gRefCnt = 0;
nsIXULSortService* RDFGenericBuilderImpl::gXULSortService = nsnull;
nsIAtom* RDFGenericBuilderImpl::kContainerAtom;
nsIAtom* RDFGenericBuilderImpl::kContainerContentsGeneratedAtom;
nsIAtom* RDFGenericBuilderImpl::kContainmentAtom;
nsIAtom* RDFGenericBuilderImpl::kEmptyAtom;
nsIAtom* RDFGenericBuilderImpl::kIdAtom;
@ -334,7 +330,6 @@ nsIAtom* RDFGenericBuilderImpl::kIgnoreAtom;
nsIAtom* RDFGenericBuilderImpl::kInstanceOfAtom;
nsIAtom* RDFGenericBuilderImpl::kIsContainerAtom;
nsIAtom* RDFGenericBuilderImpl::kIsEmptyAtom;
nsIAtom* RDFGenericBuilderImpl::kLazyContentAtom;
nsIAtom* RDFGenericBuilderImpl::kNaturalOrderPosAtom;
nsIAtom* RDFGenericBuilderImpl::kOpenAtom;
nsIAtom* RDFGenericBuilderImpl::kPersistAtom;
@ -343,7 +338,6 @@ nsIAtom* RDFGenericBuilderImpl::kRefAtom;
nsIAtom* RDFGenericBuilderImpl::kResourceAtom;
nsIAtom* RDFGenericBuilderImpl::kRuleAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateContentsGeneratedAtom;
nsIAtom* RDFGenericBuilderImpl::kTextAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeChildrenAtom;
@ -409,7 +403,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
--gRefCnt;
if (gRefCnt == 0) {
NS_IF_RELEASE(kContainerAtom);
NS_IF_RELEASE(kContainerContentsGeneratedAtom);
NS_IF_RELEASE(kContainmentAtom);
NS_IF_RELEASE(kEmptyAtom);
NS_IF_RELEASE(kIdAtom);
@ -417,7 +410,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kInstanceOfAtom);
NS_IF_RELEASE(kIsContainerAtom);
NS_IF_RELEASE(kIsEmptyAtom);
NS_IF_RELEASE(kLazyContentAtom);
NS_IF_RELEASE(kNaturalOrderPosAtom);
NS_IF_RELEASE(kOpenAtom);
NS_IF_RELEASE(kPersistAtom);
@ -426,7 +418,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kResourceAtom);
NS_IF_RELEASE(kRuleAtom);
NS_IF_RELEASE(kTemplateAtom);
NS_IF_RELEASE(kTemplateContentsGeneratedAtom);
NS_IF_RELEASE(kTextAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeChildrenAtom);
@ -474,7 +465,6 @@ RDFGenericBuilderImpl::Init()
{
if (gRefCnt++ == 0) {
kContainerAtom = NS_NewAtom("container");
kContainerContentsGeneratedAtom = NS_NewAtom("containercontentsgenerated");
kContainmentAtom = NS_NewAtom("containment");
kEmptyAtom = NS_NewAtom("empty");
kIdAtom = NS_NewAtom("id");
@ -482,7 +472,6 @@ RDFGenericBuilderImpl::Init()
kInstanceOfAtom = NS_NewAtom("instanceOf");
kIsContainerAtom = NS_NewAtom("iscontainer");
kIsEmptyAtom = NS_NewAtom("isempty");
kLazyContentAtom = NS_NewAtom("lazycontent");
kNaturalOrderPosAtom = NS_NewAtom("pos");
kOpenAtom = NS_NewAtom("open");
kPersistAtom = NS_NewAtom("persist");
@ -491,7 +480,6 @@ RDFGenericBuilderImpl::Init()
kResourceAtom = NS_NewAtom("resource");
kRuleAtom = NS_NewAtom("rule");
kTemplateAtom = NS_NewAtom("template");
kTemplateContentsGeneratedAtom = NS_NewAtom("templatecontentsgenerated");
kTextAtom = NS_NewAtom("text");
kTreeAtom = NS_NewAtom("tree");
kTreeChildrenAtom = NS_NewAtom("treechildren");
@ -812,21 +800,21 @@ RDFGenericBuilderImpl::CloseContainer(nsIContent* aElement)
if (NS_FAILED(rv)) return rv;
}
// Force the XUL element to remember that it needs to re-generate
// its kids next time around.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
NS_ASSERTION(xulcontent != nsnull, "not an nsIXULContent");
if (! xulcontent)
return NS_ERROR_UNEXPECTED;
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
// Clear the contents-generated attribute so that the next time we
// come back, we'll regenerate the kids we just killed.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
PR_FALSE);
rv = xulcontent->ClearLazyState(nsIXULContent::eContainerContentsBuilt);
if (NS_FAILED(rv)) return rv;
// XXX Hack. Setting this attribute forces the RDF element to
// remember that it needs to be re-generated next time around.
rv = aElement->SetAttribute(kNameSpaceID_None,
kLazyContentAtom,
nsAutoString("true"),
PR_FALSE);
if (NS_FAILED(rv)) return rv;
return NS_OK;
}
@ -848,27 +836,19 @@ RDFGenericBuilderImpl::RebuildContainer(nsIContent* aElement)
rv = RemoveGeneratedContent(aElement);
if (NS_FAILED(rv)) return rv;
// Clear the contents-generated attribute so that the next time we
// come back, we'll regenerate the kids we just killed.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
PR_FALSE);
if (NS_FAILED(rv)) return rv;
// Forces the XUL element to remember that it needs to
// re-generate its children next time around.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
// XXX Hack. Setting this attribute forces the RDF element to
// remember that it needs to be re-generated next time around.
rv = aElement->SetAttribute(kNameSpaceID_None,
kLazyContentAtom,
nsAutoString("true"),
PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = xulcontent->ClearLazyState(nsIXULContent::eTemplateContentsBuilt);
if (NS_FAILED(rv)) return rv;
// Since we're changing the 'ref' attribute, we'll need to
// rebuild content for _this_ resource template, too.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = xulcontent->ClearLazyState(nsIXULContent::eContainerContentsBuilt);
if (NS_FAILED(rv)) return rv;
}
// Do it!!!
rv = CreateContents(aElement);
@ -940,9 +920,15 @@ RDFGenericBuilderImpl::CreateElement(PRInt32 aNameSpaceID,
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource URI");
if (NS_FAILED(rv)) return rv;
nsAutoString id;
PRUnichar buf[128];
nsAutoString id(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
#if 0 // XXX c'mon, this URI is _never_ going to be relative to the document!
rv = gXULUtils->MakeElementID(doc, nsAutoString(uri), id);
if (NS_FAILED(rv)) return rv;
#endif
id = uri;
rv = result->SetAttribute(kNameSpaceID_None, kIdAtom, id, PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set id attribute");
@ -1024,13 +1010,18 @@ RDFGenericBuilderImpl::OnAssert(nsIRDFResource* aSource,
// because we know that _eventually_ the contents will be
// generated (via CreateContents()) when somebody asks for
// them later.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and append the new
@ -1135,13 +1126,18 @@ RDFGenericBuilderImpl::OnUnassert(nsIRDFResource* aSource,
// But if the contents of aElement _haven't_ yet been
// generated, then just ignore the unassertion: nothing is
// in the content model to remove.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and remove the
@ -1254,13 +1250,18 @@ RDFGenericBuilderImpl::OnChange(nsIRDFResource* aSource,
// But if the contents of aElement _haven't_ yet been
// generated, then just ignore: nothing is in the content
// model to remove.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and remove the
@ -1352,11 +1353,8 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
// Note: some attributes must be skipped on XUL template rule subtree
// never compare against {}:container attribute
if ((attr.get() == kLazyContentAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
// never compare against rdf:property attribute
else if ((attr.get() == kPropertyAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
if ((attr.get() == kPropertyAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
continue;
// never compare against rdf:instanceOf attribute
else if ((attr.get() == kInstanceOfAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
@ -1367,9 +1365,6 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
// never compare against {}:xulcontentsgenerated attribute
else if ((attr.get() == kXULContentsGeneratedAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
// never compare against {}:itemcontentsgenerated attribute (bogus)
else if ((attr.get() == kTemplateContentsGeneratedAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
nsAutoString value;
rv = aRule->GetAttribute(attrNameSpaceID, attr, value);
@ -1407,7 +1402,8 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
rv = mDB->GetTarget(aChild, property, PR_TRUE, getter_AddRefs(target));
if (NS_FAILED(rv)) return rv;
nsAutoString targetStr;
PRUnichar buf[128];
nsAutoString targetStr(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
rv = gXULUtils->GetTextForNode(target, targetStr);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get text for target");
if (NS_FAILED(rv)) return rv;
@ -1511,12 +1507,8 @@ RDFGenericBuilderImpl::FindTemplate(nsIContent* aElement,
PRBool
RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAttribute)
{
// never copy rdf:container attribute
if ((aAttribute == kLazyContentAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
// never copy rdf:property attribute
else if ((aAttribute == kPropertyAtom) && (aNameSpaceID == kNameSpaceID_RDF)) {
if ((aAttribute == kPropertyAtom) && (aNameSpaceID == kNameSpaceID_RDF)) {
return PR_TRUE;
}
// never copy rdf:instanceOf attribute
@ -1531,10 +1523,6 @@ RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtt
else if ((aAttribute == kURIAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
// never copy {}:templatecontentsgenerated attribute (bogus)
else if ((aAttribute == kTemplateContentsGeneratedAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
else {
return PR_FALSE;
}
@ -1542,21 +1530,23 @@ RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtt
nsresult
RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource,
const nsString& aSubstitution,
nsString& aResult)
RDFGenericBuilderImpl::SubstituteText(nsIRDFResource* aResource,
nsString& aAttributeValue)
{
nsresult rv;
if (aSubstitution.Find("rdf:") == 0) {
// found an attribute which wants to bind
// its value to RDF so look it up in the
// graph
nsAutoString propertyStr(aSubstitution);
propertyStr.Cut(0,4);
if (aAttributeValue.Equals("...") || aAttributeValue.Equals("rdf:*")) {
const char *uri = nsnull;
aResource->GetValueConst(&uri);
aAttributeValue = uri;
}
else if (aAttributeValue.Find("rdf:") == 0) {
// found an attribute which wants to bind its value to RDF so
// look it up in the graph
aAttributeValue.Cut(0,4);
nsCOMPtr<nsIRDFResource> property;
rv = gRDFService->GetUnicodeResource(propertyStr.GetUnicode(), getter_AddRefs(property));
rv = gRDFService->GetUnicodeResource(aAttributeValue.GetUnicode(), getter_AddRefs(property));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIRDFNode> valueNode;
@ -1564,20 +1554,15 @@ RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource,
if (NS_FAILED(rv)) return rv;
if ((rv != NS_RDF_NO_VALUE) && (valueNode)) {
rv = gXULUtils->GetTextForNode(valueNode, aResult);
rv = gXULUtils->GetTextForNode(valueNode, aAttributeValue);
if (NS_FAILED(rv)) return rv;
}
else {
aResult.Truncate();
aAttributeValue.Truncate();
}
}
else if (aSubstitution.Equals("...") || aSubstitution.Equals("rdf:*")) {
const char *uri = nsnull;
aResource->GetValueConst(&uri);
aResult = uri;
}
else {
aResult = aSubstitution;
// Nothing to do!
}
return NS_OK;
@ -1632,17 +1617,20 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
// check whether this item is the "resource" element
PRBool isResourceElement = PR_FALSE;
nsAutoString idValue;
rv = tmplKid->GetAttribute(kNameSpaceID_None,
kURIAtom,
idValue);
if (NS_FAILED(rv)) return rv;
{
PRUnichar buf[128];
nsAutoString idValue(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(kNameSpaceID_None,
kURIAtom,
idValue);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) &&
(idValue.Equals("...") || idValue.Equals("rdf:*"))) {
isResourceElement = PR_TRUE;
aIsUnique = PR_FALSE;
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) &&
(idValue.Equals("...") || idValue.Equals("rdf:*"))) {
isResourceElement = PR_TRUE;
aIsUnique = PR_FALSE;
}
}
nsCOMPtr<nsIAtom> tag;
rv = tmplKid->GetTag(*getter_AddRefs(tag));
@ -1664,14 +1652,11 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
// Mark the element's contents as being generated so
// that any re-entrant calls don't trigger an infinite
// recursion.
rv = realKid->SetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set contents-generated attribute");
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(realKid);
if (xulcontent) {
rv = xulcontent->SetLazyState(nsIXULContent::eTemplateContentsBuilt);
if (NS_FAILED(rv)) return rv;
}
}
// Recurse until we get to the resource element.
@ -1697,13 +1682,13 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
else if ((tag.get() == kTextAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
// <xul:text value="..."> is replaced by text of the
// actual value of the rdf:resource attribute for the given node
nsAutoString attrValue;
PRUnichar attrbuf[128];
nsAutoString attrValue(CBufDescriptor(attrbuf, PR_TRUE, sizeof(attrbuf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(kNameSpaceID_None, kValueAtom, attrValue);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Length() > 0)) {
nsAutoString text;
rv = GetSubstitutionText(aChild, attrValue, text);
rv = SubstituteText(aChild, attrValue);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsITextContent> content;
@ -1713,7 +1698,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
getter_AddRefs(content));
if (NS_FAILED(rv)) return rv;
rv = content->SetText(text.GetUnicode(), text.Length(), PR_FALSE);
rv = content->SetText(attrValue.GetUnicode(), attrValue.Length(), PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = aRealNode->AppendChildTo(nsCOMPtr<nsIContent>( do_QueryInterface(content) ), aNotify);
@ -1735,11 +1720,6 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = realKid->SetAttribute(kNameSpaceID_None, kTemplateAtom, templateID, PR_FALSE);
if (NS_FAILED(rv)) return rv;
// mark it as a container so that its contents get
// generated. Bogus as all git up.
rv = realKid->SetAttribute(kNameSpaceID_None, kLazyContentAtom, nsAutoString("true"), PR_FALSE);
if (NS_FAILED(rv)) return rv;
// set natural order hint
if ((aNaturalOrderPos > 0) && (isResourceElement)) {
nsAutoString pos, zero("0000");
@ -1763,27 +1743,21 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = tmplKid->GetAttributeNameAt(attr, attribNameSpaceID, *getter_AddRefs(attribName));
if (NS_FAILED(rv)) return rv;
// only copy attributes that aren't already set on the
// node. XXX Why would it already be set?!?
{
nsAutoString attribValue;
rv = realKid->GetAttribute(attribNameSpaceID, attribName, attribValue);
if (NS_FAILED(rv)) return rv;
if (rv == NS_CONTENT_ATTR_HAS_VALUE) continue;
}
if (! IsIgnoreableAttribute(attribNameSpaceID, attribName)) {
nsAutoString attribValue;
// Create a buffer here, because there's a good
// chance that an attribute in the template is
// going to be an RDF URI, which is usually
// longish.
PRUnichar attrbuf[128];
nsAutoString attribValue(CBufDescriptor(attrbuf, PR_TRUE, sizeof(attrbuf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(attribNameSpaceID, attribName, attribValue);
if (NS_FAILED(rv)) return rv;
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
nsAutoString text;
rv = GetSubstitutionText(aChild, attribValue, text);
rv = SubstituteText(aChild, attribValue);
if (NS_FAILED(rv)) return rv;
rv = realKid->SetAttribute(attribNameSpaceID, attribName, text, PR_FALSE);
rv = realKid->SetAttribute(attribNameSpaceID, attribName, attribValue, PR_FALSE);
if (NS_FAILED(rv)) return rv;
}
}
@ -1818,6 +1792,17 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = BuildContentFromTemplate(tmplKid, realKid, aIsUnique, aChild, -1, aNotify);
if (NS_FAILED(rv)) return rv;
}
else {
// Otherwise, just mark the XUL element as requiring
// more work to be done. We'll get around to it when
// somebody asks for it.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(realKid);
if (! xulcontent)
return NS_ERROR_UNEXPECTED;
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
}
}
}
@ -1914,7 +1899,7 @@ RDFGenericBuilderImpl::CreateWidgetItem(nsIContent *aElement,
nsresult
RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
nsIContent* aTreeItemElement,
nsIContent* aRealElement,
eUpdateAction aAction,
nsIRDFResource* aProperty,
nsIRDFNode* aValue)
@ -1965,13 +1950,13 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
if (NS_FAILED(rv)) return rv;
if ((text.Length() > 0) && (aAction == eSet)) {
aTreeItemElement->SetAttribute(attribNameSpaceID,
aRealElement->SetAttribute(attribNameSpaceID,
attribName,
text,
PR_TRUE);
}
else {
aTreeItemElement->UnsetAttribute(attribNameSpaceID,
aRealElement->UnsetAttribute(attribNameSpaceID,
attribName,
PR_TRUE);
}
@ -1981,13 +1966,18 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
// See if we've generated kids for this node yet. If we have, then
// recursively sync up template kids with content kids
nsAutoString contentsGenerated;
rv = aTreeItemElement->GetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated = PR_TRUE;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aRealElement);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eTemplateContentsBuilt,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML content will _always_ have been generated up-front
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (contentsGenerated.Equals("true"))) {
if (contentsGenerated) {
PRInt32 count;
rv = aTemplateNode->ChildCount(count);
if (NS_FAILED(rv)) return rv;
@ -2001,7 +1991,7 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
break;
nsCOMPtr<nsIContent> realKid;
rv = aTreeItemElement->ChildAt(loop, *getter_AddRefs(realKid));
rv = aRealElement->ChildAt(loop, *getter_AddRefs(realKid));
if (NS_FAILED(rv)) return rv;
if (! realKid)
@ -2083,24 +2073,23 @@ 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.
nsAutoString attrValue;
rv = aElement->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
attrValue);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to test container-contents-generated attribute");
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Equals("true")))
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_CREATED;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = aElement->SetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set container-contents-generated attribute");
if (NS_FAILED(rv)) return rv;
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
@ -2174,22 +2163,20 @@ RDFGenericBuilderImpl::CreateTemplateContents(nsIContent* aElement, const nsStri
// See if the element's templates contents have been generated:
// this prevents a re-entrant call from triggering another
// generation.
nsAutoString attrValue;
rv = aElement->GetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
attrValue);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to test template-contents-generated attribute");
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (! xulcontent)
return NS_OK; // HTML content is _always_ generated up-front
PRBool contentsGenerated;
rv = xulcontent->GetLazyState(nsIXULContent::eTemplateContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Equals("true")))
if (contentsGenerated)
return NS_OK;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = aElement->SetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
rv = xulcontent->SetLazyState(nsIXULContent::eTemplateContentsBuilt);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set template-contents-generated attribute");
if (NS_FAILED(rv)) return rv;

10
rdf/content/src/nsIXULContent.h
Просмотреть файл

@ -43,6 +43,16 @@ public:
* instantiated.
*/
NS_IMETHOD PeekChildCount(PRInt32& aCount) const = 0;
enum {
eChildrenMustBeRebuilt = 0x1,
eTemplateContentsBuilt = 0x2,
eContainerContentsBuilt = 0x4,
};
NS_IMETHOD SetLazyState(PRInt32 aFlags) = 0;
NS_IMETHOD ClearLazyState(PRInt32 aFlags) = 0;
NS_IMETHOD GetLazyState(PRInt32 aFlag, PRBool& aResult) = 0;
};
#endif // nsIXULContent_h__

99
rdf/content/src/nsRDFElement.cpp
Просмотреть файл

@ -331,6 +331,9 @@ public:
// nsIXULContent
NS_IMETHOD PeekChildCount(PRInt32& aCount) const;
NS_IMETHOD SetLazyState(PRInt32 aFlags);
NS_IMETHOD ClearLazyState(PRInt32 aFlags);
NS_IMETHOD GetLazyState(PRInt32 aFlag, PRBool& aValue);
// nsIDOMEventReceiver
NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
@ -420,7 +423,6 @@ private:
static nsIAtom* kRefAtom;
static nsIAtom* kClassAtom;
static nsIAtom* kStyleAtom;
static nsIAtom* kLazyContentAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeItemAtom;
@ -451,7 +453,6 @@ private:
nsIAtom* mTag; // [OWNER]
nsIEventListenerManager* mListenerManager; // [OWNER]
nsXULAttributes* mAttributes; // [OWNER]
PRBool mContentsMustBeGenerated;
nsVoidArray* mBroadcastListeners; // [WEAK]
nsIDOMXULElement* mBroadcaster; // [WEAK]
nsIController* mController; // [OWNER]
@ -460,6 +461,9 @@ private:
// An unreferenced bare pointer to an aggregate that can implement
// element-specific APIs.
nsXULElement* mInnerXULElement;
// The state of our sloth; see nsIXULContent.
PRInt32 mLazyState;
};
@ -471,7 +475,6 @@ nsIAtom* RDFElementImpl::kIdAtom;
nsIAtom* RDFElementImpl::kRefAtom;
nsIAtom* RDFElementImpl::kClassAtom;
nsIAtom* RDFElementImpl::kStyleAtom;
nsIAtom* RDFElementImpl::kLazyContentAtom;
nsIAtom* RDFElementImpl::kTreeAtom;
nsIAtom* RDFElementImpl::kTreeItemAtom;
nsIAtom* RDFElementImpl::kTreeRowAtom;
@ -552,11 +555,11 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
mTag(aTag),
mListenerManager(nsnull),
mAttributes(nsnull),
mContentsMustBeGenerated(PR_FALSE),
mBroadcastListeners(nsnull),
mBroadcaster(nsnull),
mController(nsnull),
mInnerXULElement(nsnull)
mInnerXULElement(nsnull),
mLazyState(0)
{
NS_INIT_REFCNT();
NS_ADDREF(aTag);
@ -573,7 +576,6 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
kRefAtom = NS_NewAtom("ref");
kClassAtom = NS_NewAtom("class");
kStyleAtom = NS_NewAtom("style");
kLazyContentAtom = NS_NewAtom("lazycontent");
kTreeAtom = NS_NewAtom("tree");
kTreeItemAtom = NS_NewAtom("treeitem");
kTreeRowAtom = NS_NewAtom("treerow");
@ -663,7 +665,6 @@ RDFElementImpl::~RDFElementImpl()
NS_IF_RELEASE(kRefAtom);
NS_IF_RELEASE(kClassAtom);
NS_IF_RELEASE(kStyleAtom);
NS_IF_RELEASE(kLazyContentAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeItemAtom);
NS_IF_RELEASE(kTreeRowAtom);
@ -1448,6 +1449,28 @@ RDFElementImpl::PeekChildCount(PRInt32& aCount) const
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::SetLazyState(PRInt32 aFlags)
{
mLazyState |= aFlags;
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::ClearLazyState(PRInt32 aFlags)
{
mLazyState &= ~aFlags;
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::GetLazyState(PRInt32 aFlag, PRBool& aResult)
{
aResult = (mLazyState & aFlag) ? PR_TRUE : PR_FALSE;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
// nsIDOMEventReceiver interface
@ -2410,15 +2433,6 @@ RDFElementImpl::SetAttribute(PRInt32 aNameSpaceID,
mDocument->AttributeChanged(NS_STATIC_CAST(nsIStyledContent*, this), aName, NS_STYLE_HINT_UNKNOWN);
}
// Check to see if this is the RDF:container property; if so, and
// the value is "true", then remember to generate our kids on
// demand.
if ((aNameSpaceID == kNameSpaceID_None) &&
(aName == kLazyContentAtom) &&
(aValue.EqualsIgnoreCase("true"))) {
mContentsMustBeGenerated = PR_TRUE;
}
return rv;
}
@ -3123,38 +3137,37 @@ RDFElementImpl::GetRefResource(nsIRDFResource** aResource)
nsresult
RDFElementImpl::EnsureContentsGenerated(void) const
{
if (! mContentsMustBeGenerated)
return NS_OK;
if (mLazyState & nsIXULContent::eChildrenMustBeRebuilt) {
nsresult rv;
nsresult rv;
// Ensure that the element is actually _in_ the document tree;
// otherwise, somebody is trying to generate children for a node
// that's not currently in the content model.
NS_PRECONDITION(mDocument != nsnull, "element not in tree");
if (!mDocument)
return NS_ERROR_NOT_INITIALIZED;
// Ensure that the element is actually _in_ the document tree;
// otherwise, somebody is trying to generate children for a node
// that's not currently in the content model.
NS_PRECONDITION(mDocument != nsnull, "element not in tree");
if (!mDocument)
return NS_ERROR_NOT_INITIALIZED;
// XXX hack because we can't use "mutable"
RDFElementImpl* unconstThis = NS_CONST_CAST(RDFElementImpl*, this);
// XXX hack because we can't use "mutable"
RDFElementImpl* unconstThis = NS_CONST_CAST(RDFElementImpl*, this);
if (! unconstThis->mChildren) {
if (NS_FAILED(rv = NS_NewISupportsArray(&unconstThis->mChildren)))
return rv;
}
if (! unconstThis->mChildren) {
if (NS_FAILED(rv = NS_NewISupportsArray(&unconstThis->mChildren)))
return rv;
// Clear this value *first*, so we can re-enter the nsIContent
// getters if needed.
unconstThis->mLazyState &= ~nsIXULContent::eChildrenMustBeRebuilt;
nsCOMPtr<nsIRDFDocument> rdfDoc = do_QueryInterface(mDocument);
if (! mDocument)
return NS_OK;
rv = rdfDoc->CreateContents(NS_STATIC_CAST(nsIStyledContent*, unconstThis));
NS_ASSERTION(NS_SUCCEEDED(rv), "problem creating kids");
if (NS_FAILED(rv)) return rv;
}
// Clear this value *first*, so we can re-enter the nsIContent
// getters if needed.
unconstThis->mContentsMustBeGenerated = PR_FALSE;
nsCOMPtr<nsIRDFDocument> rdfDoc;
if (NS_FAILED(rv = mDocument->QueryInterface(kIRDFDocumentIID,
(void**) getter_AddRefs(rdfDoc))))
return rv;
rv = rdfDoc->CreateContents(NS_STATIC_CAST(nsIStyledContent*, unconstThis));
NS_ASSERTION(NS_SUCCEEDED(rv), "problem creating kids");
return rv;
return NS_OK;
}

333
rdf/content/src/nsRDFGenericBuilder.cpp
Просмотреть файл

@ -62,6 +62,7 @@
#include "nsIXULSortService.h"
#include "nsLayoutCID.h"
#include "nsRDFCID.h"
#include "nsIXULContent.h"
#include "nsIXULContentUtils.h"
#include "nsString.h"
#include "nsVoidArray.h"
@ -169,9 +170,8 @@ public:
IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtom);
nsresult
GetSubstitutionText(nsIRDFResource* aResource,
const nsString& aSubstitution,
nsString& aResult);
SubstituteText(nsIRDFResource* aResource,
nsString& aAttributeValue);
nsresult
BuildContentFromTemplate(nsIContent *aTemplateNode,
@ -280,7 +280,6 @@ protected:
static nsIXULContentUtils* gXULUtils;
static nsIAtom* kContainerAtom;
static nsIAtom* kContainerContentsGeneratedAtom;
static nsIAtom* kContainmentAtom;
static nsIAtom* kEmptyAtom;
static nsIAtom* kIdAtom;
@ -288,7 +287,6 @@ protected:
static nsIAtom* kInstanceOfAtom;
static nsIAtom* kIsContainerAtom;
static nsIAtom* kIsEmptyAtom;
static nsIAtom* kLazyContentAtom;
static nsIAtom* kNaturalOrderPosAtom;
static nsIAtom* kOpenAtom;
static nsIAtom* kPersistAtom;
@ -297,7 +295,6 @@ protected:
static nsIAtom* kResourceAtom;
static nsIAtom* kRuleAtom;
static nsIAtom* kTemplateAtom;
static nsIAtom* kTemplateContentsGeneratedAtom;
static nsIAtom* kTextAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeChildrenAtom;
@ -326,7 +323,6 @@ nsrefcnt RDFGenericBuilderImpl::gRefCnt = 0;
nsIXULSortService* RDFGenericBuilderImpl::gXULSortService = nsnull;
nsIAtom* RDFGenericBuilderImpl::kContainerAtom;
nsIAtom* RDFGenericBuilderImpl::kContainerContentsGeneratedAtom;
nsIAtom* RDFGenericBuilderImpl::kContainmentAtom;
nsIAtom* RDFGenericBuilderImpl::kEmptyAtom;
nsIAtom* RDFGenericBuilderImpl::kIdAtom;
@ -334,7 +330,6 @@ nsIAtom* RDFGenericBuilderImpl::kIgnoreAtom;
nsIAtom* RDFGenericBuilderImpl::kInstanceOfAtom;
nsIAtom* RDFGenericBuilderImpl::kIsContainerAtom;
nsIAtom* RDFGenericBuilderImpl::kIsEmptyAtom;
nsIAtom* RDFGenericBuilderImpl::kLazyContentAtom;
nsIAtom* RDFGenericBuilderImpl::kNaturalOrderPosAtom;
nsIAtom* RDFGenericBuilderImpl::kOpenAtom;
nsIAtom* RDFGenericBuilderImpl::kPersistAtom;
@ -343,7 +338,6 @@ nsIAtom* RDFGenericBuilderImpl::kRefAtom;
nsIAtom* RDFGenericBuilderImpl::kResourceAtom;
nsIAtom* RDFGenericBuilderImpl::kRuleAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateContentsGeneratedAtom;
nsIAtom* RDFGenericBuilderImpl::kTextAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeChildrenAtom;
@ -409,7 +403,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
--gRefCnt;
if (gRefCnt == 0) {
NS_IF_RELEASE(kContainerAtom);
NS_IF_RELEASE(kContainerContentsGeneratedAtom);
NS_IF_RELEASE(kContainmentAtom);
NS_IF_RELEASE(kEmptyAtom);
NS_IF_RELEASE(kIdAtom);
@ -417,7 +410,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kInstanceOfAtom);
NS_IF_RELEASE(kIsContainerAtom);
NS_IF_RELEASE(kIsEmptyAtom);
NS_IF_RELEASE(kLazyContentAtom);
NS_IF_RELEASE(kNaturalOrderPosAtom);
NS_IF_RELEASE(kOpenAtom);
NS_IF_RELEASE(kPersistAtom);
@ -426,7 +418,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kResourceAtom);
NS_IF_RELEASE(kRuleAtom);
NS_IF_RELEASE(kTemplateAtom);
NS_IF_RELEASE(kTemplateContentsGeneratedAtom);
NS_IF_RELEASE(kTextAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeChildrenAtom);
@ -474,7 +465,6 @@ RDFGenericBuilderImpl::Init()
{
if (gRefCnt++ == 0) {
kContainerAtom = NS_NewAtom("container");
kContainerContentsGeneratedAtom = NS_NewAtom("containercontentsgenerated");
kContainmentAtom = NS_NewAtom("containment");
kEmptyAtom = NS_NewAtom("empty");
kIdAtom = NS_NewAtom("id");
@ -482,7 +472,6 @@ RDFGenericBuilderImpl::Init()
kInstanceOfAtom = NS_NewAtom("instanceOf");
kIsContainerAtom = NS_NewAtom("iscontainer");
kIsEmptyAtom = NS_NewAtom("isempty");
kLazyContentAtom = NS_NewAtom("lazycontent");
kNaturalOrderPosAtom = NS_NewAtom("pos");
kOpenAtom = NS_NewAtom("open");
kPersistAtom = NS_NewAtom("persist");
@ -491,7 +480,6 @@ RDFGenericBuilderImpl::Init()
kResourceAtom = NS_NewAtom("resource");
kRuleAtom = NS_NewAtom("rule");
kTemplateAtom = NS_NewAtom("template");
kTemplateContentsGeneratedAtom = NS_NewAtom("templatecontentsgenerated");
kTextAtom = NS_NewAtom("text");
kTreeAtom = NS_NewAtom("tree");
kTreeChildrenAtom = NS_NewAtom("treechildren");
@ -812,21 +800,21 @@ RDFGenericBuilderImpl::CloseContainer(nsIContent* aElement)
if (NS_FAILED(rv)) return rv;
}
// Force the XUL element to remember that it needs to re-generate
// its kids next time around.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
NS_ASSERTION(xulcontent != nsnull, "not an nsIXULContent");
if (! xulcontent)
return NS_ERROR_UNEXPECTED;
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
// Clear the contents-generated attribute so that the next time we
// come back, we'll regenerate the kids we just killed.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
PR_FALSE);
rv = xulcontent->ClearLazyState(nsIXULContent::eContainerContentsBuilt);
if (NS_FAILED(rv)) return rv;
// XXX Hack. Setting this attribute forces the RDF element to
// remember that it needs to be re-generated next time around.
rv = aElement->SetAttribute(kNameSpaceID_None,
kLazyContentAtom,
nsAutoString("true"),
PR_FALSE);
if (NS_FAILED(rv)) return rv;
return NS_OK;
}
@ -848,27 +836,19 @@ RDFGenericBuilderImpl::RebuildContainer(nsIContent* aElement)
rv = RemoveGeneratedContent(aElement);
if (NS_FAILED(rv)) return rv;
// Clear the contents-generated attribute so that the next time we
// come back, we'll regenerate the kids we just killed.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
PR_FALSE);
if (NS_FAILED(rv)) return rv;
// Forces the XUL element to remember that it needs to
// re-generate its children next time around.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
// XXX Hack. Setting this attribute forces the RDF element to
// remember that it needs to be re-generated next time around.
rv = aElement->SetAttribute(kNameSpaceID_None,
kLazyContentAtom,
nsAutoString("true"),
PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = xulcontent->ClearLazyState(nsIXULContent::eTemplateContentsBuilt);
if (NS_FAILED(rv)) return rv;
// Since we're changing the 'ref' attribute, we'll need to
// rebuild content for _this_ resource template, too.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = xulcontent->ClearLazyState(nsIXULContent::eContainerContentsBuilt);
if (NS_FAILED(rv)) return rv;
}
// Do it!!!
rv = CreateContents(aElement);
@ -940,9 +920,15 @@ RDFGenericBuilderImpl::CreateElement(PRInt32 aNameSpaceID,
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource URI");
if (NS_FAILED(rv)) return rv;
nsAutoString id;
PRUnichar buf[128];
nsAutoString id(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
#if 0 // XXX c'mon, this URI is _never_ going to be relative to the document!
rv = gXULUtils->MakeElementID(doc, nsAutoString(uri), id);
if (NS_FAILED(rv)) return rv;
#endif
id = uri;
rv = result->SetAttribute(kNameSpaceID_None, kIdAtom, id, PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set id attribute");
@ -1024,13 +1010,18 @@ RDFGenericBuilderImpl::OnAssert(nsIRDFResource* aSource,
// because we know that _eventually_ the contents will be
// generated (via CreateContents()) when somebody asks for
// them later.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and append the new
@ -1135,13 +1126,18 @@ RDFGenericBuilderImpl::OnUnassert(nsIRDFResource* aSource,
// But if the contents of aElement _haven't_ yet been
// generated, then just ignore the unassertion: nothing is
// in the content model to remove.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and remove the
@ -1254,13 +1250,18 @@ RDFGenericBuilderImpl::OnChange(nsIRDFResource* aSource,
// But if the contents of aElement _haven't_ yet been
// generated, then just ignore: nothing is in the content
// model to remove.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and remove the
@ -1352,11 +1353,8 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
// Note: some attributes must be skipped on XUL template rule subtree
// never compare against {}:container attribute
if ((attr.get() == kLazyContentAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
// never compare against rdf:property attribute
else if ((attr.get() == kPropertyAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
if ((attr.get() == kPropertyAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
continue;
// never compare against rdf:instanceOf attribute
else if ((attr.get() == kInstanceOfAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
@ -1367,9 +1365,6 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
// never compare against {}:xulcontentsgenerated attribute
else if ((attr.get() == kXULContentsGeneratedAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
// never compare against {}:itemcontentsgenerated attribute (bogus)
else if ((attr.get() == kTemplateContentsGeneratedAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
nsAutoString value;
rv = aRule->GetAttribute(attrNameSpaceID, attr, value);
@ -1407,7 +1402,8 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
rv = mDB->GetTarget(aChild, property, PR_TRUE, getter_AddRefs(target));
if (NS_FAILED(rv)) return rv;
nsAutoString targetStr;
PRUnichar buf[128];
nsAutoString targetStr(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
rv = gXULUtils->GetTextForNode(target, targetStr);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get text for target");
if (NS_FAILED(rv)) return rv;
@ -1511,12 +1507,8 @@ RDFGenericBuilderImpl::FindTemplate(nsIContent* aElement,
PRBool
RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAttribute)
{
// never copy rdf:container attribute
if ((aAttribute == kLazyContentAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
// never copy rdf:property attribute
else if ((aAttribute == kPropertyAtom) && (aNameSpaceID == kNameSpaceID_RDF)) {
if ((aAttribute == kPropertyAtom) && (aNameSpaceID == kNameSpaceID_RDF)) {
return PR_TRUE;
}
// never copy rdf:instanceOf attribute
@ -1531,10 +1523,6 @@ RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtt
else if ((aAttribute == kURIAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
// never copy {}:templatecontentsgenerated attribute (bogus)
else if ((aAttribute == kTemplateContentsGeneratedAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
else {
return PR_FALSE;
}
@ -1542,21 +1530,23 @@ RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtt
nsresult
RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource,
const nsString& aSubstitution,
nsString& aResult)
RDFGenericBuilderImpl::SubstituteText(nsIRDFResource* aResource,
nsString& aAttributeValue)
{
nsresult rv;
if (aSubstitution.Find("rdf:") == 0) {
// found an attribute which wants to bind
// its value to RDF so look it up in the
// graph
nsAutoString propertyStr(aSubstitution);
propertyStr.Cut(0,4);
if (aAttributeValue.Equals("...") || aAttributeValue.Equals("rdf:*")) {
const char *uri = nsnull;
aResource->GetValueConst(&uri);
aAttributeValue = uri;
}
else if (aAttributeValue.Find("rdf:") == 0) {
// found an attribute which wants to bind its value to RDF so
// look it up in the graph
aAttributeValue.Cut(0,4);
nsCOMPtr<nsIRDFResource> property;
rv = gRDFService->GetUnicodeResource(propertyStr.GetUnicode(), getter_AddRefs(property));
rv = gRDFService->GetUnicodeResource(aAttributeValue.GetUnicode(), getter_AddRefs(property));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIRDFNode> valueNode;
@ -1564,20 +1554,15 @@ RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource,
if (NS_FAILED(rv)) return rv;
if ((rv != NS_RDF_NO_VALUE) && (valueNode)) {
rv = gXULUtils->GetTextForNode(valueNode, aResult);
rv = gXULUtils->GetTextForNode(valueNode, aAttributeValue);
if (NS_FAILED(rv)) return rv;
}
else {
aResult.Truncate();
aAttributeValue.Truncate();
}
}
else if (aSubstitution.Equals("...") || aSubstitution.Equals("rdf:*")) {
const char *uri = nsnull;
aResource->GetValueConst(&uri);
aResult = uri;
}
else {
aResult = aSubstitution;
// Nothing to do!
}
return NS_OK;
@ -1632,17 +1617,20 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
// check whether this item is the "resource" element
PRBool isResourceElement = PR_FALSE;
nsAutoString idValue;
rv = tmplKid->GetAttribute(kNameSpaceID_None,
kURIAtom,
idValue);
if (NS_FAILED(rv)) return rv;
{
PRUnichar buf[128];
nsAutoString idValue(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(kNameSpaceID_None,
kURIAtom,
idValue);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) &&
(idValue.Equals("...") || idValue.Equals("rdf:*"))) {
isResourceElement = PR_TRUE;
aIsUnique = PR_FALSE;
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) &&
(idValue.Equals("...") || idValue.Equals("rdf:*"))) {
isResourceElement = PR_TRUE;
aIsUnique = PR_FALSE;
}
}
nsCOMPtr<nsIAtom> tag;
rv = tmplKid->GetTag(*getter_AddRefs(tag));
@ -1664,14 +1652,11 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
// Mark the element's contents as being generated so
// that any re-entrant calls don't trigger an infinite
// recursion.
rv = realKid->SetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set contents-generated attribute");
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(realKid);
if (xulcontent) {
rv = xulcontent->SetLazyState(nsIXULContent::eTemplateContentsBuilt);
if (NS_FAILED(rv)) return rv;
}
}
// Recurse until we get to the resource element.
@ -1697,13 +1682,13 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
else if ((tag.get() == kTextAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
// <xul:text value="..."> is replaced by text of the
// actual value of the rdf:resource attribute for the given node
nsAutoString attrValue;
PRUnichar attrbuf[128];
nsAutoString attrValue(CBufDescriptor(attrbuf, PR_TRUE, sizeof(attrbuf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(kNameSpaceID_None, kValueAtom, attrValue);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Length() > 0)) {
nsAutoString text;
rv = GetSubstitutionText(aChild, attrValue, text);
rv = SubstituteText(aChild, attrValue);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsITextContent> content;
@ -1713,7 +1698,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
getter_AddRefs(content));
if (NS_FAILED(rv)) return rv;
rv = content->SetText(text.GetUnicode(), text.Length(), PR_FALSE);
rv = content->SetText(attrValue.GetUnicode(), attrValue.Length(), PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = aRealNode->AppendChildTo(nsCOMPtr<nsIContent>( do_QueryInterface(content) ), aNotify);
@ -1735,11 +1720,6 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = realKid->SetAttribute(kNameSpaceID_None, kTemplateAtom, templateID, PR_FALSE);
if (NS_FAILED(rv)) return rv;
// mark it as a container so that its contents get
// generated. Bogus as all git up.
rv = realKid->SetAttribute(kNameSpaceID_None, kLazyContentAtom, nsAutoString("true"), PR_FALSE);
if (NS_FAILED(rv)) return rv;
// set natural order hint
if ((aNaturalOrderPos > 0) && (isResourceElement)) {
nsAutoString pos, zero("0000");
@ -1763,27 +1743,21 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = tmplKid->GetAttributeNameAt(attr, attribNameSpaceID, *getter_AddRefs(attribName));
if (NS_FAILED(rv)) return rv;
// only copy attributes that aren't already set on the
// node. XXX Why would it already be set?!?
{
nsAutoString attribValue;
rv = realKid->GetAttribute(attribNameSpaceID, attribName, attribValue);
if (NS_FAILED(rv)) return rv;
if (rv == NS_CONTENT_ATTR_HAS_VALUE) continue;
}
if (! IsIgnoreableAttribute(attribNameSpaceID, attribName)) {
nsAutoString attribValue;
// Create a buffer here, because there's a good
// chance that an attribute in the template is
// going to be an RDF URI, which is usually
// longish.
PRUnichar attrbuf[128];
nsAutoString attribValue(CBufDescriptor(attrbuf, PR_TRUE, sizeof(attrbuf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(attribNameSpaceID, attribName, attribValue);
if (NS_FAILED(rv)) return rv;
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
nsAutoString text;
rv = GetSubstitutionText(aChild, attribValue, text);
rv = SubstituteText(aChild, attribValue);
if (NS_FAILED(rv)) return rv;
rv = realKid->SetAttribute(attribNameSpaceID, attribName, text, PR_FALSE);
rv = realKid->SetAttribute(attribNameSpaceID, attribName, attribValue, PR_FALSE);
if (NS_FAILED(rv)) return rv;
}
}
@ -1818,6 +1792,17 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = BuildContentFromTemplate(tmplKid, realKid, aIsUnique, aChild, -1, aNotify);
if (NS_FAILED(rv)) return rv;
}
else {
// Otherwise, just mark the XUL element as requiring
// more work to be done. We'll get around to it when
// somebody asks for it.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(realKid);
if (! xulcontent)
return NS_ERROR_UNEXPECTED;
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
}
}
}
@ -1914,7 +1899,7 @@ RDFGenericBuilderImpl::CreateWidgetItem(nsIContent *aElement,
nsresult
RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
nsIContent* aTreeItemElement,
nsIContent* aRealElement,
eUpdateAction aAction,
nsIRDFResource* aProperty,
nsIRDFNode* aValue)
@ -1965,13 +1950,13 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
if (NS_FAILED(rv)) return rv;
if ((text.Length() > 0) && (aAction == eSet)) {
aTreeItemElement->SetAttribute(attribNameSpaceID,
aRealElement->SetAttribute(attribNameSpaceID,
attribName,
text,
PR_TRUE);
}
else {
aTreeItemElement->UnsetAttribute(attribNameSpaceID,
aRealElement->UnsetAttribute(attribNameSpaceID,
attribName,
PR_TRUE);
}
@ -1981,13 +1966,18 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
// See if we've generated kids for this node yet. If we have, then
// recursively sync up template kids with content kids
nsAutoString contentsGenerated;
rv = aTreeItemElement->GetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated = PR_TRUE;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aRealElement);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eTemplateContentsBuilt,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML content will _always_ have been generated up-front
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (contentsGenerated.Equals("true"))) {
if (contentsGenerated) {
PRInt32 count;
rv = aTemplateNode->ChildCount(count);
if (NS_FAILED(rv)) return rv;
@ -2001,7 +1991,7 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
break;
nsCOMPtr<nsIContent> realKid;
rv = aTreeItemElement->ChildAt(loop, *getter_AddRefs(realKid));
rv = aRealElement->ChildAt(loop, *getter_AddRefs(realKid));
if (NS_FAILED(rv)) return rv;
if (! realKid)
@ -2083,24 +2073,23 @@ 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.
nsAutoString attrValue;
rv = aElement->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
attrValue);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to test container-contents-generated attribute");
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Equals("true")))
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_CREATED;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = aElement->SetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set container-contents-generated attribute");
if (NS_FAILED(rv)) return rv;
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
@ -2174,22 +2163,20 @@ RDFGenericBuilderImpl::CreateTemplateContents(nsIContent* aElement, const nsStri
// See if the element's templates contents have been generated:
// this prevents a re-entrant call from triggering another
// generation.
nsAutoString attrValue;
rv = aElement->GetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
attrValue);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to test template-contents-generated attribute");
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (! xulcontent)
return NS_OK; // HTML content is _always_ generated up-front
PRBool contentsGenerated;
rv = xulcontent->GetLazyState(nsIXULContent::eTemplateContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Equals("true")))
if (contentsGenerated)
return NS_OK;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = aElement->SetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
rv = xulcontent->SetLazyState(nsIXULContent::eTemplateContentsBuilt);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set template-contents-generated attribute");
if (NS_FAILED(rv)) return rv;

7
rdf/content/src/nsXULContentUtils.cpp
Просмотреть файл

@ -345,7 +345,9 @@ nsXULContentUtils::GetElementResource(nsIContent* aElement, nsIRDFResource** aRe
// Perform a reverse mapping from an element in the content model
// to an RDF resource.
nsresult rv;
nsAutoString id;
PRUnichar buf[128];
nsAutoString id(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
nsCOMPtr<nsIAtom> kIdAtom( dont_AddRef(NS_NewAtom("id")) );
rv = aElement->GetAttribute(kNameSpaceID_None, kIdAtom, id);
@ -379,7 +381,8 @@ nsXULContentUtils::GetElementRefResource(nsIContent* aElement, nsIRDFResource**
// to an RDF resource. Check for a "ref" attribute first, then
// fallback on an "id" attribute.
nsresult rv;
nsAutoString uri;
PRUnichar buf[128];
nsAutoString uri(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
nsCOMPtr<nsIAtom> kIdAtom( dont_AddRef(NS_NewAtom("ref")) );
rv = aElement->GetAttribute(kNameSpaceID_None, kIdAtom, uri);

4
rdf/content/src/nsXULDocument.cpp
Просмотреть файл

@ -852,7 +852,6 @@ protected:
static PRInt32 gRefCnt;
static nsIAtom* kContainerContentsGeneratedAtom;
static nsIAtom* kIdAtom;
static nsIAtom* kLazyContentAtom;
static nsIAtom* kObservesAtom;
static nsIAtom* kOpenAtom;
static nsIAtom* kPersistAtom;
@ -942,7 +941,6 @@ protected:
PRInt32 XULDocumentImpl::gRefCnt = 0;
nsIAtom* XULDocumentImpl::kContainerContentsGeneratedAtom;
nsIAtom* XULDocumentImpl::kIdAtom;
nsIAtom* XULDocumentImpl::kLazyContentAtom;
nsIAtom* XULDocumentImpl::kObservesAtom;
nsIAtom* XULDocumentImpl::kOpenAtom;
nsIAtom* XULDocumentImpl::kPersistAtom;
@ -990,7 +988,6 @@ XULDocumentImpl::XULDocumentImpl(void)
if (gRefCnt++ == 0) {
kContainerContentsGeneratedAtom = NS_NewAtom("containercontentsgenerated");
kIdAtom = NS_NewAtom("id");
kLazyContentAtom = NS_NewAtom("lazycontent");
kObservesAtom = NS_NewAtom("observes");
kOpenAtom = NS_NewAtom("open");
kPersistAtom = NS_NewAtom("persist");
@ -1103,7 +1100,6 @@ XULDocumentImpl::~XULDocumentImpl()
if (--gRefCnt == 0) {
NS_IF_RELEASE(kContainerContentsGeneratedAtom);
NS_IF_RELEASE(kIdAtom);
NS_IF_RELEASE(kLazyContentAtom);
NS_IF_RELEASE(kObservesAtom);
NS_IF_RELEASE(kOpenAtom);
NS_IF_RELEASE(kPersistAtom);

99
rdf/content/src/nsXULElement.cpp
Просмотреть файл

@ -331,6 +331,9 @@ public:
// nsIXULContent
NS_IMETHOD PeekChildCount(PRInt32& aCount) const;
NS_IMETHOD SetLazyState(PRInt32 aFlags);
NS_IMETHOD ClearLazyState(PRInt32 aFlags);
NS_IMETHOD GetLazyState(PRInt32 aFlag, PRBool& aValue);
// nsIDOMEventReceiver
NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
@ -420,7 +423,6 @@ private:
static nsIAtom* kRefAtom;
static nsIAtom* kClassAtom;
static nsIAtom* kStyleAtom;
static nsIAtom* kLazyContentAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeItemAtom;
@ -451,7 +453,6 @@ private:
nsIAtom* mTag; // [OWNER]
nsIEventListenerManager* mListenerManager; // [OWNER]
nsXULAttributes* mAttributes; // [OWNER]
PRBool mContentsMustBeGenerated;
nsVoidArray* mBroadcastListeners; // [WEAK]
nsIDOMXULElement* mBroadcaster; // [WEAK]
nsIController* mController; // [OWNER]
@ -460,6 +461,9 @@ private:
// An unreferenced bare pointer to an aggregate that can implement
// element-specific APIs.
nsXULElement* mInnerXULElement;
// The state of our sloth; see nsIXULContent.
PRInt32 mLazyState;
};
@ -471,7 +475,6 @@ nsIAtom* RDFElementImpl::kIdAtom;
nsIAtom* RDFElementImpl::kRefAtom;
nsIAtom* RDFElementImpl::kClassAtom;
nsIAtom* RDFElementImpl::kStyleAtom;
nsIAtom* RDFElementImpl::kLazyContentAtom;
nsIAtom* RDFElementImpl::kTreeAtom;
nsIAtom* RDFElementImpl::kTreeItemAtom;
nsIAtom* RDFElementImpl::kTreeRowAtom;
@ -552,11 +555,11 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
mTag(aTag),
mListenerManager(nsnull),
mAttributes(nsnull),
mContentsMustBeGenerated(PR_FALSE),
mBroadcastListeners(nsnull),
mBroadcaster(nsnull),
mController(nsnull),
mInnerXULElement(nsnull)
mInnerXULElement(nsnull),
mLazyState(0)
{
NS_INIT_REFCNT();
NS_ADDREF(aTag);
@ -573,7 +576,6 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
kRefAtom = NS_NewAtom("ref");
kClassAtom = NS_NewAtom("class");
kStyleAtom = NS_NewAtom("style");
kLazyContentAtom = NS_NewAtom("lazycontent");
kTreeAtom = NS_NewAtom("tree");
kTreeItemAtom = NS_NewAtom("treeitem");
kTreeRowAtom = NS_NewAtom("treerow");
@ -663,7 +665,6 @@ RDFElementImpl::~RDFElementImpl()
NS_IF_RELEASE(kRefAtom);
NS_IF_RELEASE(kClassAtom);
NS_IF_RELEASE(kStyleAtom);
NS_IF_RELEASE(kLazyContentAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeItemAtom);
NS_IF_RELEASE(kTreeRowAtom);
@ -1448,6 +1449,28 @@ RDFElementImpl::PeekChildCount(PRInt32& aCount) const
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::SetLazyState(PRInt32 aFlags)
{
mLazyState |= aFlags;
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::ClearLazyState(PRInt32 aFlags)
{
mLazyState &= ~aFlags;
return NS_OK;
}
NS_IMETHODIMP
RDFElementImpl::GetLazyState(PRInt32 aFlag, PRBool& aResult)
{
aResult = (mLazyState & aFlag) ? PR_TRUE : PR_FALSE;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
// nsIDOMEventReceiver interface
@ -2410,15 +2433,6 @@ RDFElementImpl::SetAttribute(PRInt32 aNameSpaceID,
mDocument->AttributeChanged(NS_STATIC_CAST(nsIStyledContent*, this), aName, NS_STYLE_HINT_UNKNOWN);
}
// Check to see if this is the RDF:container property; if so, and
// the value is "true", then remember to generate our kids on
// demand.
if ((aNameSpaceID == kNameSpaceID_None) &&
(aName == kLazyContentAtom) &&
(aValue.EqualsIgnoreCase("true"))) {
mContentsMustBeGenerated = PR_TRUE;
}
return rv;
}
@ -3123,38 +3137,37 @@ RDFElementImpl::GetRefResource(nsIRDFResource** aResource)
nsresult
RDFElementImpl::EnsureContentsGenerated(void) const
{
if (! mContentsMustBeGenerated)
return NS_OK;
if (mLazyState & nsIXULContent::eChildrenMustBeRebuilt) {
nsresult rv;
nsresult rv;
// Ensure that the element is actually _in_ the document tree;
// otherwise, somebody is trying to generate children for a node
// that's not currently in the content model.
NS_PRECONDITION(mDocument != nsnull, "element not in tree");
if (!mDocument)
return NS_ERROR_NOT_INITIALIZED;
// Ensure that the element is actually _in_ the document tree;
// otherwise, somebody is trying to generate children for a node
// that's not currently in the content model.
NS_PRECONDITION(mDocument != nsnull, "element not in tree");
if (!mDocument)
return NS_ERROR_NOT_INITIALIZED;
// XXX hack because we can't use "mutable"
RDFElementImpl* unconstThis = NS_CONST_CAST(RDFElementImpl*, this);
// XXX hack because we can't use "mutable"
RDFElementImpl* unconstThis = NS_CONST_CAST(RDFElementImpl*, this);
if (! unconstThis->mChildren) {
if (NS_FAILED(rv = NS_NewISupportsArray(&unconstThis->mChildren)))
return rv;
}
if (! unconstThis->mChildren) {
if (NS_FAILED(rv = NS_NewISupportsArray(&unconstThis->mChildren)))
return rv;
// Clear this value *first*, so we can re-enter the nsIContent
// getters if needed.
unconstThis->mLazyState &= ~nsIXULContent::eChildrenMustBeRebuilt;
nsCOMPtr<nsIRDFDocument> rdfDoc = do_QueryInterface(mDocument);
if (! mDocument)
return NS_OK;
rv = rdfDoc->CreateContents(NS_STATIC_CAST(nsIStyledContent*, unconstThis));
NS_ASSERTION(NS_SUCCEEDED(rv), "problem creating kids");
if (NS_FAILED(rv)) return rv;
}
// Clear this value *first*, so we can re-enter the nsIContent
// getters if needed.
unconstThis->mContentsMustBeGenerated = PR_FALSE;
nsCOMPtr<nsIRDFDocument> rdfDoc;
if (NS_FAILED(rv = mDocument->QueryInterface(kIRDFDocumentIID,
(void**) getter_AddRefs(rdfDoc))))
return rv;
rv = rdfDoc->CreateContents(NS_STATIC_CAST(nsIStyledContent*, unconstThis));
NS_ASSERTION(NS_SUCCEEDED(rv), "problem creating kids");
return rv;
return NS_OK;
}

333
rdf/content/src/nsXULTemplateBuilder.cpp
Просмотреть файл

@ -62,6 +62,7 @@
#include "nsIXULSortService.h"
#include "nsLayoutCID.h"
#include "nsRDFCID.h"
#include "nsIXULContent.h"
#include "nsIXULContentUtils.h"
#include "nsString.h"
#include "nsVoidArray.h"
@ -169,9 +170,8 @@ public:
IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtom);
nsresult
GetSubstitutionText(nsIRDFResource* aResource,
const nsString& aSubstitution,
nsString& aResult);
SubstituteText(nsIRDFResource* aResource,
nsString& aAttributeValue);
nsresult
BuildContentFromTemplate(nsIContent *aTemplateNode,
@ -280,7 +280,6 @@ protected:
static nsIXULContentUtils* gXULUtils;
static nsIAtom* kContainerAtom;
static nsIAtom* kContainerContentsGeneratedAtom;
static nsIAtom* kContainmentAtom;
static nsIAtom* kEmptyAtom;
static nsIAtom* kIdAtom;
@ -288,7 +287,6 @@ protected:
static nsIAtom* kInstanceOfAtom;
static nsIAtom* kIsContainerAtom;
static nsIAtom* kIsEmptyAtom;
static nsIAtom* kLazyContentAtom;
static nsIAtom* kNaturalOrderPosAtom;
static nsIAtom* kOpenAtom;
static nsIAtom* kPersistAtom;
@ -297,7 +295,6 @@ protected:
static nsIAtom* kResourceAtom;
static nsIAtom* kRuleAtom;
static nsIAtom* kTemplateAtom;
static nsIAtom* kTemplateContentsGeneratedAtom;
static nsIAtom* kTextAtom;
static nsIAtom* kTreeAtom;
static nsIAtom* kTreeChildrenAtom;
@ -326,7 +323,6 @@ nsrefcnt RDFGenericBuilderImpl::gRefCnt = 0;
nsIXULSortService* RDFGenericBuilderImpl::gXULSortService = nsnull;
nsIAtom* RDFGenericBuilderImpl::kContainerAtom;
nsIAtom* RDFGenericBuilderImpl::kContainerContentsGeneratedAtom;
nsIAtom* RDFGenericBuilderImpl::kContainmentAtom;
nsIAtom* RDFGenericBuilderImpl::kEmptyAtom;
nsIAtom* RDFGenericBuilderImpl::kIdAtom;
@ -334,7 +330,6 @@ nsIAtom* RDFGenericBuilderImpl::kIgnoreAtom;
nsIAtom* RDFGenericBuilderImpl::kInstanceOfAtom;
nsIAtom* RDFGenericBuilderImpl::kIsContainerAtom;
nsIAtom* RDFGenericBuilderImpl::kIsEmptyAtom;
nsIAtom* RDFGenericBuilderImpl::kLazyContentAtom;
nsIAtom* RDFGenericBuilderImpl::kNaturalOrderPosAtom;
nsIAtom* RDFGenericBuilderImpl::kOpenAtom;
nsIAtom* RDFGenericBuilderImpl::kPersistAtom;
@ -343,7 +338,6 @@ nsIAtom* RDFGenericBuilderImpl::kRefAtom;
nsIAtom* RDFGenericBuilderImpl::kResourceAtom;
nsIAtom* RDFGenericBuilderImpl::kRuleAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateAtom;
nsIAtom* RDFGenericBuilderImpl::kTemplateContentsGeneratedAtom;
nsIAtom* RDFGenericBuilderImpl::kTextAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeAtom;
nsIAtom* RDFGenericBuilderImpl::kTreeChildrenAtom;
@ -409,7 +403,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
--gRefCnt;
if (gRefCnt == 0) {
NS_IF_RELEASE(kContainerAtom);
NS_IF_RELEASE(kContainerContentsGeneratedAtom);
NS_IF_RELEASE(kContainmentAtom);
NS_IF_RELEASE(kEmptyAtom);
NS_IF_RELEASE(kIdAtom);
@ -417,7 +410,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kInstanceOfAtom);
NS_IF_RELEASE(kIsContainerAtom);
NS_IF_RELEASE(kIsEmptyAtom);
NS_IF_RELEASE(kLazyContentAtom);
NS_IF_RELEASE(kNaturalOrderPosAtom);
NS_IF_RELEASE(kOpenAtom);
NS_IF_RELEASE(kPersistAtom);
@ -426,7 +418,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
NS_IF_RELEASE(kResourceAtom);
NS_IF_RELEASE(kRuleAtom);
NS_IF_RELEASE(kTemplateAtom);
NS_IF_RELEASE(kTemplateContentsGeneratedAtom);
NS_IF_RELEASE(kTextAtom);
NS_IF_RELEASE(kTreeAtom);
NS_IF_RELEASE(kTreeChildrenAtom);
@ -474,7 +465,6 @@ RDFGenericBuilderImpl::Init()
{
if (gRefCnt++ == 0) {
kContainerAtom = NS_NewAtom("container");
kContainerContentsGeneratedAtom = NS_NewAtom("containercontentsgenerated");
kContainmentAtom = NS_NewAtom("containment");
kEmptyAtom = NS_NewAtom("empty");
kIdAtom = NS_NewAtom("id");
@ -482,7 +472,6 @@ RDFGenericBuilderImpl::Init()
kInstanceOfAtom = NS_NewAtom("instanceOf");
kIsContainerAtom = NS_NewAtom("iscontainer");
kIsEmptyAtom = NS_NewAtom("isempty");
kLazyContentAtom = NS_NewAtom("lazycontent");
kNaturalOrderPosAtom = NS_NewAtom("pos");
kOpenAtom = NS_NewAtom("open");
kPersistAtom = NS_NewAtom("persist");
@ -491,7 +480,6 @@ RDFGenericBuilderImpl::Init()
kResourceAtom = NS_NewAtom("resource");
kRuleAtom = NS_NewAtom("rule");
kTemplateAtom = NS_NewAtom("template");
kTemplateContentsGeneratedAtom = NS_NewAtom("templatecontentsgenerated");
kTextAtom = NS_NewAtom("text");
kTreeAtom = NS_NewAtom("tree");
kTreeChildrenAtom = NS_NewAtom("treechildren");
@ -812,21 +800,21 @@ RDFGenericBuilderImpl::CloseContainer(nsIContent* aElement)
if (NS_FAILED(rv)) return rv;
}
// Force the XUL element to remember that it needs to re-generate
// its kids next time around.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
NS_ASSERTION(xulcontent != nsnull, "not an nsIXULContent");
if (! xulcontent)
return NS_ERROR_UNEXPECTED;
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
// Clear the contents-generated attribute so that the next time we
// come back, we'll regenerate the kids we just killed.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
PR_FALSE);
rv = xulcontent->ClearLazyState(nsIXULContent::eContainerContentsBuilt);
if (NS_FAILED(rv)) return rv;
// XXX Hack. Setting this attribute forces the RDF element to
// remember that it needs to be re-generated next time around.
rv = aElement->SetAttribute(kNameSpaceID_None,
kLazyContentAtom,
nsAutoString("true"),
PR_FALSE);
if (NS_FAILED(rv)) return rv;
return NS_OK;
}
@ -848,27 +836,19 @@ RDFGenericBuilderImpl::RebuildContainer(nsIContent* aElement)
rv = RemoveGeneratedContent(aElement);
if (NS_FAILED(rv)) return rv;
// Clear the contents-generated attribute so that the next time we
// come back, we'll regenerate the kids we just killed.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
PR_FALSE);
if (NS_FAILED(rv)) return rv;
// Forces the XUL element to remember that it needs to
// re-generate its children next time around.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
// XXX Hack. Setting this attribute forces the RDF element to
// remember that it needs to be re-generated next time around.
rv = aElement->SetAttribute(kNameSpaceID_None,
kLazyContentAtom,
nsAutoString("true"),
PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = xulcontent->ClearLazyState(nsIXULContent::eTemplateContentsBuilt);
if (NS_FAILED(rv)) return rv;
// Since we're changing the 'ref' attribute, we'll need to
// rebuild content for _this_ resource template, too.
rv = aElement->UnsetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = xulcontent->ClearLazyState(nsIXULContent::eContainerContentsBuilt);
if (NS_FAILED(rv)) return rv;
}
// Do it!!!
rv = CreateContents(aElement);
@ -940,9 +920,15 @@ RDFGenericBuilderImpl::CreateElement(PRInt32 aNameSpaceID,
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource URI");
if (NS_FAILED(rv)) return rv;
nsAutoString id;
PRUnichar buf[128];
nsAutoString id(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
#if 0 // XXX c'mon, this URI is _never_ going to be relative to the document!
rv = gXULUtils->MakeElementID(doc, nsAutoString(uri), id);
if (NS_FAILED(rv)) return rv;
#endif
id = uri;
rv = result->SetAttribute(kNameSpaceID_None, kIdAtom, id, PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set id attribute");
@ -1024,13 +1010,18 @@ RDFGenericBuilderImpl::OnAssert(nsIRDFResource* aSource,
// because we know that _eventually_ the contents will be
// generated (via CreateContents()) when somebody asks for
// them later.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and append the new
@ -1135,13 +1126,18 @@ RDFGenericBuilderImpl::OnUnassert(nsIRDFResource* aSource,
// But if the contents of aElement _haven't_ yet been
// generated, then just ignore the unassertion: nothing is
// in the content model to remove.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and remove the
@ -1254,13 +1250,18 @@ RDFGenericBuilderImpl::OnChange(nsIRDFResource* aSource,
// But if the contents of aElement _haven't_ yet been
// generated, then just ignore: nothing is in the content
// model to remove.
nsAutoString contentsGenerated;
rv = element->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(element);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv != NS_CONTENT_ATTR_HAS_VALUE) || !contentsGenerated.Equals("true"))
if (! contentsGenerated)
return NS_OK;
// Okay, it's a "live" element, so go ahead and remove the
@ -1352,11 +1353,8 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
// Note: some attributes must be skipped on XUL template rule subtree
// never compare against {}:container attribute
if ((attr.get() == kLazyContentAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
// never compare against rdf:property attribute
else if ((attr.get() == kPropertyAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
if ((attr.get() == kPropertyAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
continue;
// never compare against rdf:instanceOf attribute
else if ((attr.get() == kInstanceOfAtom) && (attrNameSpaceID == kNameSpaceID_RDF))
@ -1367,9 +1365,6 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
// never compare against {}:xulcontentsgenerated attribute
else if ((attr.get() == kXULContentsGeneratedAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
// never compare against {}:itemcontentsgenerated attribute (bogus)
else if ((attr.get() == kTemplateContentsGeneratedAtom) && (attrNameSpaceID == kNameSpaceID_None))
continue;
nsAutoString value;
rv = aRule->GetAttribute(attrNameSpaceID, attr, value);
@ -1407,7 +1402,8 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent* aElement,
rv = mDB->GetTarget(aChild, property, PR_TRUE, getter_AddRefs(target));
if (NS_FAILED(rv)) return rv;
nsAutoString targetStr;
PRUnichar buf[128];
nsAutoString targetStr(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
rv = gXULUtils->GetTextForNode(target, targetStr);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get text for target");
if (NS_FAILED(rv)) return rv;
@ -1511,12 +1507,8 @@ RDFGenericBuilderImpl::FindTemplate(nsIContent* aElement,
PRBool
RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAttribute)
{
// never copy rdf:container attribute
if ((aAttribute == kLazyContentAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
// never copy rdf:property attribute
else if ((aAttribute == kPropertyAtom) && (aNameSpaceID == kNameSpaceID_RDF)) {
if ((aAttribute == kPropertyAtom) && (aNameSpaceID == kNameSpaceID_RDF)) {
return PR_TRUE;
}
// never copy rdf:instanceOf attribute
@ -1531,10 +1523,6 @@ RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtt
else if ((aAttribute == kURIAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
// never copy {}:templatecontentsgenerated attribute (bogus)
else if ((aAttribute == kTemplateContentsGeneratedAtom) && (aNameSpaceID == kNameSpaceID_None)) {
return PR_TRUE;
}
else {
return PR_FALSE;
}
@ -1542,21 +1530,23 @@ RDFGenericBuilderImpl::IsIgnoreableAttribute(PRInt32 aNameSpaceID, nsIAtom* aAtt
nsresult
RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource,
const nsString& aSubstitution,
nsString& aResult)
RDFGenericBuilderImpl::SubstituteText(nsIRDFResource* aResource,
nsString& aAttributeValue)
{
nsresult rv;
if (aSubstitution.Find("rdf:") == 0) {
// found an attribute which wants to bind
// its value to RDF so look it up in the
// graph
nsAutoString propertyStr(aSubstitution);
propertyStr.Cut(0,4);
if (aAttributeValue.Equals("...") || aAttributeValue.Equals("rdf:*")) {
const char *uri = nsnull;
aResource->GetValueConst(&uri);
aAttributeValue = uri;
}
else if (aAttributeValue.Find("rdf:") == 0) {
// found an attribute which wants to bind its value to RDF so
// look it up in the graph
aAttributeValue.Cut(0,4);
nsCOMPtr<nsIRDFResource> property;
rv = gRDFService->GetUnicodeResource(propertyStr.GetUnicode(), getter_AddRefs(property));
rv = gRDFService->GetUnicodeResource(aAttributeValue.GetUnicode(), getter_AddRefs(property));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIRDFNode> valueNode;
@ -1564,20 +1554,15 @@ RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource,
if (NS_FAILED(rv)) return rv;
if ((rv != NS_RDF_NO_VALUE) && (valueNode)) {
rv = gXULUtils->GetTextForNode(valueNode, aResult);
rv = gXULUtils->GetTextForNode(valueNode, aAttributeValue);
if (NS_FAILED(rv)) return rv;
}
else {
aResult.Truncate();
aAttributeValue.Truncate();
}
}
else if (aSubstitution.Equals("...") || aSubstitution.Equals("rdf:*")) {
const char *uri = nsnull;
aResource->GetValueConst(&uri);
aResult = uri;
}
else {
aResult = aSubstitution;
// Nothing to do!
}
return NS_OK;
@ -1632,17 +1617,20 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
// check whether this item is the "resource" element
PRBool isResourceElement = PR_FALSE;
nsAutoString idValue;
rv = tmplKid->GetAttribute(kNameSpaceID_None,
kURIAtom,
idValue);
if (NS_FAILED(rv)) return rv;
{
PRUnichar buf[128];
nsAutoString idValue(CBufDescriptor(buf, PR_TRUE, sizeof(buf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(kNameSpaceID_None,
kURIAtom,
idValue);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) &&
(idValue.Equals("...") || idValue.Equals("rdf:*"))) {
isResourceElement = PR_TRUE;
aIsUnique = PR_FALSE;
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) &&
(idValue.Equals("...") || idValue.Equals("rdf:*"))) {
isResourceElement = PR_TRUE;
aIsUnique = PR_FALSE;
}
}
nsCOMPtr<nsIAtom> tag;
rv = tmplKid->GetTag(*getter_AddRefs(tag));
@ -1664,14 +1652,11 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
// Mark the element's contents as being generated so
// that any re-entrant calls don't trigger an infinite
// recursion.
rv = realKid->SetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set contents-generated attribute");
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(realKid);
if (xulcontent) {
rv = xulcontent->SetLazyState(nsIXULContent::eTemplateContentsBuilt);
if (NS_FAILED(rv)) return rv;
}
}
// Recurse until we get to the resource element.
@ -1697,13 +1682,13 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
else if ((tag.get() == kTextAtom) && (nameSpaceID == kNameSpaceID_XUL)) {
// <xul:text value="..."> is replaced by text of the
// actual value of the rdf:resource attribute for the given node
nsAutoString attrValue;
PRUnichar attrbuf[128];
nsAutoString attrValue(CBufDescriptor(attrbuf, PR_TRUE, sizeof(attrbuf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(kNameSpaceID_None, kValueAtom, attrValue);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Length() > 0)) {
nsAutoString text;
rv = GetSubstitutionText(aChild, attrValue, text);
rv = SubstituteText(aChild, attrValue);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsITextContent> content;
@ -1713,7 +1698,7 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
getter_AddRefs(content));
if (NS_FAILED(rv)) return rv;
rv = content->SetText(text.GetUnicode(), text.Length(), PR_FALSE);
rv = content->SetText(attrValue.GetUnicode(), attrValue.Length(), PR_FALSE);
if (NS_FAILED(rv)) return rv;
rv = aRealNode->AppendChildTo(nsCOMPtr<nsIContent>( do_QueryInterface(content) ), aNotify);
@ -1735,11 +1720,6 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = realKid->SetAttribute(kNameSpaceID_None, kTemplateAtom, templateID, PR_FALSE);
if (NS_FAILED(rv)) return rv;
// mark it as a container so that its contents get
// generated. Bogus as all git up.
rv = realKid->SetAttribute(kNameSpaceID_None, kLazyContentAtom, nsAutoString("true"), PR_FALSE);
if (NS_FAILED(rv)) return rv;
// set natural order hint
if ((aNaturalOrderPos > 0) && (isResourceElement)) {
nsAutoString pos, zero("0000");
@ -1763,27 +1743,21 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = tmplKid->GetAttributeNameAt(attr, attribNameSpaceID, *getter_AddRefs(attribName));
if (NS_FAILED(rv)) return rv;
// only copy attributes that aren't already set on the
// node. XXX Why would it already be set?!?
{
nsAutoString attribValue;
rv = realKid->GetAttribute(attribNameSpaceID, attribName, attribValue);
if (NS_FAILED(rv)) return rv;
if (rv == NS_CONTENT_ATTR_HAS_VALUE) continue;
}
if (! IsIgnoreableAttribute(attribNameSpaceID, attribName)) {
nsAutoString attribValue;
// Create a buffer here, because there's a good
// chance that an attribute in the template is
// going to be an RDF URI, which is usually
// longish.
PRUnichar attrbuf[128];
nsAutoString attribValue(CBufDescriptor(attrbuf, PR_TRUE, sizeof(attrbuf) / sizeof(PRUnichar), 0));
rv = tmplKid->GetAttribute(attribNameSpaceID, attribName, attribValue);
if (NS_FAILED(rv)) return rv;
if (rv == NS_CONTENT_ATTR_HAS_VALUE) {
nsAutoString text;
rv = GetSubstitutionText(aChild, attribValue, text);
rv = SubstituteText(aChild, attribValue);
if (NS_FAILED(rv)) return rv;
rv = realKid->SetAttribute(attribNameSpaceID, attribName, text, PR_FALSE);
rv = realKid->SetAttribute(attribNameSpaceID, attribName, attribValue, PR_FALSE);
if (NS_FAILED(rv)) return rv;
}
}
@ -1818,6 +1792,17 @@ RDFGenericBuilderImpl::BuildContentFromTemplate(nsIContent *aTemplateNode,
rv = BuildContentFromTemplate(tmplKid, realKid, aIsUnique, aChild, -1, aNotify);
if (NS_FAILED(rv)) return rv;
}
else {
// Otherwise, just mark the XUL element as requiring
// more work to be done. We'll get around to it when
// somebody asks for it.
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(realKid);
if (! xulcontent)
return NS_ERROR_UNEXPECTED;
rv = xulcontent->SetLazyState(nsIXULContent::eChildrenMustBeRebuilt);
if (NS_FAILED(rv)) return rv;
}
}
}
@ -1914,7 +1899,7 @@ RDFGenericBuilderImpl::CreateWidgetItem(nsIContent *aElement,
nsresult
RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
nsIContent* aTreeItemElement,
nsIContent* aRealElement,
eUpdateAction aAction,
nsIRDFResource* aProperty,
nsIRDFNode* aValue)
@ -1965,13 +1950,13 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
if (NS_FAILED(rv)) return rv;
if ((text.Length() > 0) && (aAction == eSet)) {
aTreeItemElement->SetAttribute(attribNameSpaceID,
aRealElement->SetAttribute(attribNameSpaceID,
attribName,
text,
PR_TRUE);
}
else {
aTreeItemElement->UnsetAttribute(attribNameSpaceID,
aRealElement->UnsetAttribute(attribNameSpaceID,
attribName,
PR_TRUE);
}
@ -1981,13 +1966,18 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
// See if we've generated kids for this node yet. If we have, then
// recursively sync up template kids with content kids
nsAutoString contentsGenerated;
rv = aTreeItemElement->GetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated = PR_TRUE;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aRealElement);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eTemplateContentsBuilt,
contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML content will _always_ have been generated up-front
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (contentsGenerated.Equals("true"))) {
if (contentsGenerated) {
PRInt32 count;
rv = aTemplateNode->ChildCount(count);
if (NS_FAILED(rv)) return rv;
@ -2001,7 +1991,7 @@ RDFGenericBuilderImpl::SynchronizeUsingTemplate(nsIContent* aTemplateNode,
break;
nsCOMPtr<nsIContent> realKid;
rv = aTreeItemElement->ChildAt(loop, *getter_AddRefs(realKid));
rv = aRealElement->ChildAt(loop, *getter_AddRefs(realKid));
if (NS_FAILED(rv)) return rv;
if (! realKid)
@ -2083,24 +2073,23 @@ 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.
nsAutoString attrValue;
rv = aElement->GetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
attrValue);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to test container-contents-generated attribute");
if (NS_FAILED(rv)) return rv;
PRBool contentsGenerated;
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (xulcontent) {
rv = xulcontent->GetLazyState(nsIXULContent::eContainerContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
}
else {
// HTML is always generated
contentsGenerated = PR_TRUE;
}
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Equals("true")))
if (contentsGenerated)
return NS_RDF_ELEMENT_WAS_CREATED;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = aElement->SetAttribute(kNameSpaceID_None,
kContainerContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set container-contents-generated attribute");
if (NS_FAILED(rv)) return rv;
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
@ -2174,22 +2163,20 @@ RDFGenericBuilderImpl::CreateTemplateContents(nsIContent* aElement, const nsStri
// See if the element's templates contents have been generated:
// this prevents a re-entrant call from triggering another
// generation.
nsAutoString attrValue;
rv = aElement->GetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
attrValue);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to test template-contents-generated attribute");
nsCOMPtr<nsIXULContent> xulcontent = do_QueryInterface(aElement);
if (! xulcontent)
return NS_OK; // HTML content is _always_ generated up-front
PRBool contentsGenerated;
rv = xulcontent->GetLazyState(nsIXULContent::eTemplateContentsBuilt, contentsGenerated);
if (NS_FAILED(rv)) return rv;
if ((rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrValue.Equals("true")))
if (contentsGenerated)
return NS_OK;
// Now mark the element's contents as being generated so that
// any re-entrant calls don't trigger an infinite recursion.
rv = aElement->SetAttribute(kNameSpaceID_None,
kTemplateContentsGeneratedAtom,
nsAutoString("true"),
PR_FALSE);
rv = xulcontent->SetLazyState(nsIXULContent::eTemplateContentsBuilt);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to set template-contents-generated attribute");
if (NS_FAILED(rv)) return rv;