Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 34726. Add an out parameter to ConflictSet::Add() that indicates whether the new instantiation triggered any new rules to be matched. The caller then uses this parameter to decide whether or not to add the key of a rule cluster to the 'newkeys' set. r=rjc, a=leaf

Browse Source
This commit is contained in:
waterson%netscape.com 2000-04-07 19:22:59 +00:00
parent 51b7d3b4dd
commit 315557d12e
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
content/xul/templates/src/nsXULTemplateBuilder.cpp
View File

@ -918,7 +918,7 @@ public:
ConflictSet();
~ConflictSet();
nsresult Add(const Instantiation& aInstantiation, const Rule* aRule);
nsresult Add(const Instantiation& aInstantiation, const Rule* aRule, PRBool* aDidAddKey);
void GetMatches(const Key& aKey, const MatchSet** aMatchSet) const;
@ -1097,8 +1097,10 @@ ConflictSet::Destroy()
}
nsresult
ConflictSet::Add(const Instantiation& aInstantiation, const Rule* aRule)
ConflictSet::Add(const Instantiation& aInstantiation, const Rule* aRule, PRBool* aDidAddKey)
{
*aDidAddKey = PR_FALSE;
// add the match to a table indexed by instantiation key
{
Key key(aInstantiation, aRule);
@ -1130,6 +1132,7 @@ ConflictSet::Add(const Instantiation& aInstantiation, const Rule* aRule)
if (! set->Contains(aRule, aInstantiation)) {
set->Add(aRule, aInstantiation);
*aDidAddKey = PR_TRUE;
}
}
@ -1315,12 +1318,16 @@ InstantiationNode::Propogate(const InstantiationSet& aInstantiations, void* aClo
// If we get here, we've matched the rule associated with this
// node. Add it to the conflict set, and the set of new <content,
// member> pairs.
KeySet* keyset = NS_STATIC_CAST(KeySet*, aClosure);
KeySet* newkeys = NS_STATIC_CAST(KeySet*, aClosure);
InstantiationSet::ConstIterator last = aInstantiations.Last();
for (InstantiationSet::ConstIterator inst = aInstantiations.First(); inst != last; ++inst) {
mConflictSet->Add(*inst, mRule);
keyset->Add(Key(*inst, mRule));
PRBool didAddKey;
mConflictSet->Add(*inst, mRule, &didAddKey);
if (didAddKey) {
newkeys->Add(Key(*inst, mRule));
}
}
return NS_OK;

17
rdf/content/src/nsXULTemplateBuilder.cpp
View File

@ -918,7 +918,7 @@ public:
ConflictSet();
~ConflictSet();
nsresult Add(const Instantiation& aInstantiation, const Rule* aRule);
nsresult Add(const Instantiation& aInstantiation, const Rule* aRule, PRBool* aDidAddKey);
void GetMatches(const Key& aKey, const MatchSet** aMatchSet) const;
@ -1097,8 +1097,10 @@ ConflictSet::Destroy()
}
nsresult
ConflictSet::Add(const Instantiation& aInstantiation, const Rule* aRule)
ConflictSet::Add(const Instantiation& aInstantiation, const Rule* aRule, PRBool* aDidAddKey)
{
*aDidAddKey = PR_FALSE;
// add the match to a table indexed by instantiation key
{
Key key(aInstantiation, aRule);
@ -1130,6 +1132,7 @@ ConflictSet::Add(const Instantiation& aInstantiation, const Rule* aRule)
if (! set->Contains(aRule, aInstantiation)) {
set->Add(aRule, aInstantiation);
*aDidAddKey = PR_TRUE;
}
}
@ -1315,12 +1318,16 @@ InstantiationNode::Propogate(const InstantiationSet& aInstantiations, void* aClo
// If we get here, we've matched the rule associated with this
// node. Add it to the conflict set, and the set of new <content,
// member> pairs.
KeySet* keyset = NS_STATIC_CAST(KeySet*, aClosure);
KeySet* newkeys = NS_STATIC_CAST(KeySet*, aClosure);
InstantiationSet::ConstIterator last = aInstantiations.Last();
for (InstantiationSet::ConstIterator inst = aInstantiations.First(); inst != last; ++inst) {
mConflictSet->Add(*inst, mRule);
keyset->Add(Key(*inst, mRule));
PRBool didAddKey;
mConflictSet->Add(*inst, mRule, &didAddKey);
if (didAddKey) {
newkeys->Add(Key(*inst, mRule));
}
}
return NS_OK;