Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Somehow, we lost some of the magical attributes we need to check for. (coalescing dup arcs, and allowing negative arcs)

Browse Source
This commit is contained in:
rjc%netscape.com 2000-01-12 01:47:23 +00:00
parent 98fc705a06
commit b945bae5b3
4 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
content/xul/document/src/nsXULDocument.cpp
View File

@ -190,6 +190,9 @@ nsIAtom* nsXULDocument::kRefAtom;
nsIAtom* nsXULDocument::kRuleAtom;
nsIAtom* nsXULDocument::kTemplateAtom;
nsIAtom* nsXULDocument::kCoalesceAtom;
nsIAtom* nsXULDocument::kAllowNegativesAtom;
nsIRDFService* nsXULDocument::gRDFService;
nsIRDFResource* nsXULDocument::kNC_persist;
nsIRDFResource* nsXULDocument::kNC_attribute;
@ -467,6 +470,9 @@ nsXULDocument::~nsXULDocument()
NS_IF_RELEASE(kRuleAtom);
NS_IF_RELEASE(kTemplateAtom);
NS_IF_RELEASE(kCoalesceAtom);
NS_IF_RELEASE(kAllowNegativesAtom);
if (gRDFService) {
nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
gRDFService = nsnull;
@ -3313,6 +3319,9 @@ nsXULDocument::Init()
kRuleAtom = NS_NewAtom("rule");
kTemplateAtom = NS_NewAtom("template");
kCoalesceAtom = NS_NewAtom("coalesceduplicatearcs");
kAllowNegativesAtom = NS_NewAtom("allownegativeassertions");
// Keep the RDF service cached in a member variable to make using
// it a bit less painful
rv = nsServiceManager::GetService(kRDFServiceCID,
@ -5147,6 +5156,19 @@ nsXULDocument::CheckTemplateBuilder(nsIContent* aElement)
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to construct new composite data source");
if (NS_FAILED(rv)) return rv;
// check for magical attributes
nsAutoString attrib;
if (NS_SUCCEEDED(rv = aElement->GetAttribute(kNameSpaceID_None, kCoalesceAtom, attrib))
&& (rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrib.Equals("false")))
{
db->SetCoalesceDuplicateArcs(PR_FALSE);
}
if (NS_SUCCEEDED(rv = aElement->GetAttribute(kNameSpaceID_None, kAllowNegativesAtom, attrib))
&& (rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrib.Equals("false")))
{
db->SetAllowNegativeAssertions(PR_FALSE);
}
// Add the local store as the first data source in the db. Note
// that we _might_ not be able to get a local store if we haven't
// got a profile to read from yet.

3
content/xul/document/src/nsXULDocument.h
View File

@ -462,6 +462,9 @@ protected:
static nsIAtom* kRuleAtom;
static nsIAtom* kTemplateAtom;
static nsIAtom* kCoalesceAtom;
static nsIAtom* kAllowNegativesAtom;
static nsIAtom** kIdentityAttrs[];
static nsIRDFService* gRDFService;

22
rdf/content/src/nsXULDocument.cpp
View File

@ -190,6 +190,9 @@ nsIAtom* nsXULDocument::kRefAtom;
nsIAtom* nsXULDocument::kRuleAtom;
nsIAtom* nsXULDocument::kTemplateAtom;
nsIAtom* nsXULDocument::kCoalesceAtom;
nsIAtom* nsXULDocument::kAllowNegativesAtom;
nsIRDFService* nsXULDocument::gRDFService;
nsIRDFResource* nsXULDocument::kNC_persist;
nsIRDFResource* nsXULDocument::kNC_attribute;
@ -467,6 +470,9 @@ nsXULDocument::~nsXULDocument()
NS_IF_RELEASE(kRuleAtom);
NS_IF_RELEASE(kTemplateAtom);
NS_IF_RELEASE(kCoalesceAtom);
NS_IF_RELEASE(kAllowNegativesAtom);
if (gRDFService) {
nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
gRDFService = nsnull;
@ -3313,6 +3319,9 @@ nsXULDocument::Init()
kRuleAtom = NS_NewAtom("rule");
kTemplateAtom = NS_NewAtom("template");
kCoalesceAtom = NS_NewAtom("coalesceduplicatearcs");
kAllowNegativesAtom = NS_NewAtom("allownegativeassertions");
// Keep the RDF service cached in a member variable to make using
// it a bit less painful
rv = nsServiceManager::GetService(kRDFServiceCID,
@ -5147,6 +5156,19 @@ nsXULDocument::CheckTemplateBuilder(nsIContent* aElement)
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to construct new composite data source");
if (NS_FAILED(rv)) return rv;
// check for magical attributes
nsAutoString attrib;
if (NS_SUCCEEDED(rv = aElement->GetAttribute(kNameSpaceID_None, kCoalesceAtom, attrib))
&& (rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrib.Equals("false")))
{
db->SetCoalesceDuplicateArcs(PR_FALSE);
}
if (NS_SUCCEEDED(rv = aElement->GetAttribute(kNameSpaceID_None, kAllowNegativesAtom, attrib))
&& (rv == NS_CONTENT_ATTR_HAS_VALUE) && (attrib.Equals("false")))
{
db->SetAllowNegativeAssertions(PR_FALSE);
}
// Add the local store as the first data source in the db. Note
// that we _might_ not be able to get a local store if we haven't
// got a profile to read from yet.

3
rdf/content/src/nsXULDocument.h
View File

@ -462,6 +462,9 @@ protected:
static nsIAtom* kRuleAtom;
static nsIAtom* kTemplateAtom;
static nsIAtom* kCoalesceAtom;
static nsIAtom* kAllowNegativesAtom;
static nsIAtom** kIdentityAttrs[];
static nsIRDFService* gRDFService;