wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 578696 part 1. Create new macros to notify nsTObserverArray observers without holding strong refs. No behavior changes yet. r=sicking

Browse Source
This commit is contained in:
Boris Zbarsky 2010-07-21 11:33:31 -04:00
parent 388eddcfd4
commit b891fc7b78
3 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsDocument.h
View File

@ -1019,9 +1019,9 @@ protected:
virtual nsPIDOMWindow *GetInnerWindowInternal();
virtual nsIScriptGlobalObject* GetScriptHandlingObjectInternal() const;
#define NS_DOCUMENT_NOTIFY_OBSERVERS(func_, params_) \
NS_OBSERVER_ARRAY_NOTIFY_OBSERVERS(mObservers, nsIDocumentObserver, \
func_, params_);
#define NS_DOCUMENT_NOTIFY_OBSERVERS(func_, params_) \
NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS(mObservers, nsIDocumentObserver, \
func_, params_);
#ifdef DEBUG
void VerifyRootContentState();

40
content/base/src/nsNodeUtils.cpp
View File

@ -86,13 +86,35 @@ using namespace mozilla::dom;
} while (node); \
PR_END_MACRO
// This macro expects the ownerDocument of content_ to be in scope as
// |nsIDocument* doc|
#define IMPL_STRONGREF_MUTATION_NOTIFICATION(func_, content_, params_) \
PR_BEGIN_MACRO \
nsINode* node = content_; \
NS_ASSERTION(node->GetOwnerDoc() == doc, "Bogus document"); \
if (doc) { \
static_cast<nsIMutationObserver*>(doc->BindingManager())-> \
func_ params_; \
} \
do { \
nsINode::nsSlots* slots = node->GetExistingSlots(); \
if (slots && !slots->mMutationObservers.IsEmpty()) { \
/* No need to explicitly notify the first observer first \
since that'll happen anyway. */ \
NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS( \
slots->mMutationObservers, nsIMutationObserver, \
func_, params_); \
} \
node = node->GetNodeParent(); \
} while (node); \
PR_END_MACRO
void
nsNodeUtils::CharacterDataWillChange(nsIContent* aContent,
CharacterDataChangeInfo* aInfo)
{
nsIDocument* doc = aContent->GetOwnerDoc();
IMPL_MUTATION_NOTIFICATION(CharacterDataWillChange, aContent,
IMPL_STRONGREF_MUTATION_NOTIFICATION(CharacterDataWillChange, aContent,
(doc, aContent, aInfo));
}
@ -101,7 +123,7 @@ nsNodeUtils::CharacterDataChanged(nsIContent* aContent,
CharacterDataChangeInfo* aInfo)
{
nsIDocument* doc = aContent->GetOwnerDoc();
IMPL_MUTATION_NOTIFICATION(CharacterDataChanged, aContent,
IMPL_STRONGREF_MUTATION_NOTIFICATION(CharacterDataChanged, aContent,
(doc, aContent, aInfo));
}
@ -112,7 +134,7 @@ nsNodeUtils::AttributeWillChange(nsIContent* aContent,
PRInt32 aModType)
{
nsIDocument* doc = aContent->GetOwnerDoc();
IMPL_MUTATION_NOTIFICATION(AttributeWillChange, aContent,
IMPL_STRONGREF_MUTATION_NOTIFICATION(AttributeWillChange, aContent,
(doc, aContent, aNameSpaceID, aAttribute,
aModType));
}
@ -124,7 +146,7 @@ nsNodeUtils::AttributeChanged(nsIContent* aContent,
PRInt32 aModType)
{
nsIDocument* doc = aContent->GetOwnerDoc();
IMPL_MUTATION_NOTIFICATION(AttributeChanged, aContent,
IMPL_STRONGREF_MUTATION_NOTIFICATION(AttributeChanged, aContent,
(doc, aContent, aNameSpaceID, aAttribute,
aModType));
}
@ -136,7 +158,7 @@ nsNodeUtils::ContentAppended(nsIContent* aContainer,
{
nsIDocument* doc = aContainer->GetOwnerDoc();
IMPL_MUTATION_NOTIFICATION(ContentAppended, aContainer,
IMPL_STRONGREF_MUTATION_NOTIFICATION(ContentAppended, aContainer,
(doc, aContainer, aFirstNewContent,
aNewIndexInContainer));
}
@ -161,7 +183,7 @@ nsNodeUtils::ContentInserted(nsINode* aContainer,
document = static_cast<nsIDocument*>(aContainer);
}
IMPL_MUTATION_NOTIFICATION(ContentInserted, aContainer,
IMPL_STRONGREF_MUTATION_NOTIFICATION(ContentInserted, aContainer,
(document, container, aChild, aIndexInContainer));
}
@ -185,7 +207,7 @@ nsNodeUtils::ContentRemoved(nsINode* aContainer,
document = static_cast<nsIDocument*>(aContainer);
}
IMPL_MUTATION_NOTIFICATION(ContentRemoved, aContainer,
IMPL_STRONGREF_MUTATION_NOTIFICATION(ContentRemoved, aContainer,
(document, container, aChild, aIndexInContainer));
}
@ -198,7 +220,7 @@ nsNodeUtils::ParentChainChanged(nsIContent *aContent)
nsINode::nsSlots* slots = aContent->GetExistingSlots();
if (slots && !slots->mMutationObservers.IsEmpty()) {
NS_OBSERVER_ARRAY_NOTIFY_OBSERVERS(
NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS(
slots->mMutationObservers,
nsIMutationObserver,
ParentChainChanged,
@ -212,7 +234,7 @@ nsNodeUtils::LastRelease(nsINode* aNode)
nsINode::nsSlots* slots = aNode->GetExistingSlots();
if (slots) {
if (!slots->mMutationObservers.IsEmpty()) {
NS_OBSERVER_ARRAY_NOTIFY_OBSERVERS(slots->mMutationObservers,
NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS(slots->mMutationObservers,
nsIMutationObserver,
NodeWillBeDestroyed, (aNode));
}

12
xpcom/glue/nsTObserverArray.h
View File

@ -369,7 +369,7 @@ class nsTObserverArray : public nsAutoTObserverArray<T, 0> {
// XXXbz I wish I didn't have to pass in the observer type, but I
// don't see a way to get it out of array_.
// Note that this macro only works if the array holds pointers to XPCOM objects.
#define NS_OBSERVER_ARRAY_NOTIFY_OBSERVERS(array_, obstype_, func_, params_) \
#define NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS(array_, obstype_, func_, params_) \
PR_BEGIN_MACRO \
nsTObserverArray<obstype_ *>::ForwardIterator iter_(array_); \
nsCOMPtr<obstype_> obs_; \
@ -379,4 +379,14 @@ class nsTObserverArray : public nsAutoTObserverArray<T, 0> {
} \
PR_END_MACRO
// Note that this macro only works if the array holds pointers to XPCOM objects.
#define NS_OBSERVER_ARRAY_NOTIFY_OBSERVERS(array_, obstype_, func_, params_) \
PR_BEGIN_MACRO \
nsTObserverArray<obstype_ *>::ForwardIterator iter_(array_); \
obstype_* obs_; \
while (iter_.HasMore()) { \
obs_ = iter_.GetNext(); \
obs_ -> func_ params_ ; \
} \
PR_END_MACRO
#endif // nsTObserverArray_h___