From 703b38ab21da87000fd235613cab86eed6cddbc2 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Thu, 24 Sep 1998 21:39:47 +0000 Subject: [PATCH] Implement revised nsIDocument/nsIDocumentObserver methods git-svn-id: svn://10.0.0.236/trunk@10970 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsContentList.cpp | 8 ++-- mozilla/content/base/src/nsContentList.h | 12 ++--- mozilla/content/base/src/nsDocument.cpp | 52 +++++++++++++--------- mozilla/content/base/src/nsDocument.h | 38 +++++++--------- mozilla/layout/base/src/nsContentList.cpp | 8 ++-- mozilla/layout/base/src/nsContentList.h | 12 ++--- mozilla/layout/base/src/nsDocument.cpp | 52 +++++++++++++--------- mozilla/layout/base/src/nsDocument.h | 38 +++++++--------- mozilla/layout/base/src/nsPresShell.cpp | 36 ++++----------- 9 files changed, 119 insertions(+), 137 deletions(-) diff --git a/mozilla/content/base/src/nsContentList.cpp b/mozilla/content/base/src/nsContentList.cpp index 62b343de68b..6861ed0f958 100644 --- a/mozilla/content/base/src/nsContentList.cpp +++ b/mozilla/content/base/src/nsContentList.cpp @@ -331,10 +331,10 @@ nsContentList::ContentReplaced(nsIDocument *aDocument, } NS_IMETHODIMP -nsContentList::ContentHasBeenRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +nsContentList::ContentRemoved(nsIDocument *aDocument, + nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer) { if (MatchSelf(aChild)) { Reset(); diff --git a/mozilla/content/base/src/nsContentList.h b/mozilla/content/base/src/nsContentList.h index d4fc20a530d..153b7bd21b2 100644 --- a/mozilla/content/base/src/nsContentList.h +++ b/mozilla/content/base/src/nsContentList.h @@ -83,14 +83,10 @@ public: nsIContent* aOldChild, nsIContent* aNewChild, PRInt32 aIndexInContainer); - NS_IMETHOD ContentWillBeRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) { return NS_OK; } - NS_IMETHOD ContentHasBeenRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); + NS_IMETHOD ContentRemoved(nsIDocument *aDocument, + nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer); NS_IMETHOD StyleSheetAdded(nsIDocument *aDocument, nsIStyleSheet* aStyleSheet) { return NS_OK; } NS_IMETHOD DocumentWillBeDestroyed(nsIDocument *aDocument); diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 7ecee80d2b3..06eec547b89 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -505,41 +505,48 @@ nsDocument::EndLoad() return NS_OK; } -void nsDocument::ContentChanged(nsIContent* aContent, - nsISupports* aSubContent) +NS_IMETHODIMP +nsDocument::ContentChanged(nsIContent* aContent, + nsISupports* aSubContent) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; observer->ContentChanged(this, aContent, aSubContent); } + return NS_OK; } -void nsDocument::ContentAppended(nsIContent* aContainer, - PRInt32 aNewIndexInContainer) +NS_IMETHODIMP +nsDocument::ContentAppended(nsIContent* aContainer, + PRInt32 aNewIndexInContainer) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; observer->ContentAppended(this, aContainer, aNewIndexInContainer); } + return NS_OK; } -void nsDocument::ContentInserted(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +NS_IMETHODIMP +nsDocument::ContentInserted(nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; observer->ContentInserted(this, aContainer, aChild, aIndexInContainer); } + return NS_OK; } -void nsDocument::ContentReplaced(nsIContent* aContainer, - nsIContent* aOldChild, - nsIContent* aNewChild, - PRInt32 aIndexInContainer) +NS_IMETHODIMP +nsDocument::ContentReplaced(nsIContent* aContainer, + nsIContent* aOldChild, + nsIContent* aNewChild, + PRInt32 aIndexInContainer) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { @@ -547,30 +554,33 @@ void nsDocument::ContentReplaced(nsIContent* aContainer, observer->ContentReplaced(this, aContainer, aOldChild, aNewChild, aIndexInContainer); } + return NS_OK; } -void nsDocument::ContentWillBeRemoved(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +NS_IMETHODIMP +nsDocument::ContentRemoved(nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; - observer->ContentWillBeRemoved(this, aContainer, - aChild, aIndexInContainer); + observer->ContentRemoved(this, aContainer, + aChild, aIndexInContainer); } + return NS_OK; } -void nsDocument::ContentHasBeenRemoved(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +NS_IMETHODIMP +nsDocument::AttributeChanged(nsIContent* aChild, + nsIAtom* aAttribute) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; - observer->ContentHasBeenRemoved(this, aContainer, - aChild, aIndexInContainer); + observer->AttributeChanged(this, aChild, aAttribute); } + return NS_OK; } nsresult nsDocument::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject) diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 8cd8288933a..20a85ef4a5a 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -137,28 +137,22 @@ public: // notifications to document observers. NS_IMETHOD BeginLoad(); NS_IMETHOD EndLoad(); - virtual void ContentChanged(nsIContent* aContent, - nsISupports* aSubContent); - - virtual void ContentAppended(nsIContent* aContainer, - PRInt32 aNewIndexInContainer); - - virtual void ContentInserted(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); - - virtual void ContentReplaced(nsIContent* aContainer, - nsIContent* aOldChild, - nsIContent* aNewChild, - PRInt32 aIndexInContainer); - - virtual void ContentWillBeRemoved(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); - - virtual void ContentHasBeenRemoved(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); + NS_IMETHOD ContentChanged(nsIContent* aContent, + nsISupports* aSubContent); + NS_IMETHOD AttributeChanged(nsIContent* aChild, + nsIAtom* aAttribute); + NS_IMETHOD ContentAppended(nsIContent* aContainer, + PRInt32 aNewIndexInContainer); + NS_IMETHOD ContentInserted(nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer); + NS_IMETHOD ContentReplaced(nsIContent* aContainer, + nsIContent* aOldChild, + nsIContent* aNewChild, + PRInt32 aIndexInContainer); + NS_IMETHOD ContentRemoved(nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer); /** * Returns the Selection Object diff --git a/mozilla/layout/base/src/nsContentList.cpp b/mozilla/layout/base/src/nsContentList.cpp index 62b343de68b..6861ed0f958 100644 --- a/mozilla/layout/base/src/nsContentList.cpp +++ b/mozilla/layout/base/src/nsContentList.cpp @@ -331,10 +331,10 @@ nsContentList::ContentReplaced(nsIDocument *aDocument, } NS_IMETHODIMP -nsContentList::ContentHasBeenRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +nsContentList::ContentRemoved(nsIDocument *aDocument, + nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer) { if (MatchSelf(aChild)) { Reset(); diff --git a/mozilla/layout/base/src/nsContentList.h b/mozilla/layout/base/src/nsContentList.h index d4fc20a530d..153b7bd21b2 100644 --- a/mozilla/layout/base/src/nsContentList.h +++ b/mozilla/layout/base/src/nsContentList.h @@ -83,14 +83,10 @@ public: nsIContent* aOldChild, nsIContent* aNewChild, PRInt32 aIndexInContainer); - NS_IMETHOD ContentWillBeRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) { return NS_OK; } - NS_IMETHOD ContentHasBeenRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); + NS_IMETHOD ContentRemoved(nsIDocument *aDocument, + nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer); NS_IMETHOD StyleSheetAdded(nsIDocument *aDocument, nsIStyleSheet* aStyleSheet) { return NS_OK; } NS_IMETHOD DocumentWillBeDestroyed(nsIDocument *aDocument); diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index 7ecee80d2b3..06eec547b89 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -505,41 +505,48 @@ nsDocument::EndLoad() return NS_OK; } -void nsDocument::ContentChanged(nsIContent* aContent, - nsISupports* aSubContent) +NS_IMETHODIMP +nsDocument::ContentChanged(nsIContent* aContent, + nsISupports* aSubContent) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; observer->ContentChanged(this, aContent, aSubContent); } + return NS_OK; } -void nsDocument::ContentAppended(nsIContent* aContainer, - PRInt32 aNewIndexInContainer) +NS_IMETHODIMP +nsDocument::ContentAppended(nsIContent* aContainer, + PRInt32 aNewIndexInContainer) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; observer->ContentAppended(this, aContainer, aNewIndexInContainer); } + return NS_OK; } -void nsDocument::ContentInserted(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +NS_IMETHODIMP +nsDocument::ContentInserted(nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; observer->ContentInserted(this, aContainer, aChild, aIndexInContainer); } + return NS_OK; } -void nsDocument::ContentReplaced(nsIContent* aContainer, - nsIContent* aOldChild, - nsIContent* aNewChild, - PRInt32 aIndexInContainer) +NS_IMETHODIMP +nsDocument::ContentReplaced(nsIContent* aContainer, + nsIContent* aOldChild, + nsIContent* aNewChild, + PRInt32 aIndexInContainer) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { @@ -547,30 +554,33 @@ void nsDocument::ContentReplaced(nsIContent* aContainer, observer->ContentReplaced(this, aContainer, aOldChild, aNewChild, aIndexInContainer); } + return NS_OK; } -void nsDocument::ContentWillBeRemoved(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +NS_IMETHODIMP +nsDocument::ContentRemoved(nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; - observer->ContentWillBeRemoved(this, aContainer, - aChild, aIndexInContainer); + observer->ContentRemoved(this, aContainer, + aChild, aIndexInContainer); } + return NS_OK; } -void nsDocument::ContentHasBeenRemoved(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +NS_IMETHODIMP +nsDocument::AttributeChanged(nsIContent* aChild, + nsIAtom* aAttribute) { PRInt32 count = mObservers.Count(); for (PRInt32 i = 0; i < count; i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; - observer->ContentHasBeenRemoved(this, aContainer, - aChild, aIndexInContainer); + observer->AttributeChanged(this, aChild, aAttribute); } + return NS_OK; } nsresult nsDocument::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject) diff --git a/mozilla/layout/base/src/nsDocument.h b/mozilla/layout/base/src/nsDocument.h index 8cd8288933a..20a85ef4a5a 100644 --- a/mozilla/layout/base/src/nsDocument.h +++ b/mozilla/layout/base/src/nsDocument.h @@ -137,28 +137,22 @@ public: // notifications to document observers. NS_IMETHOD BeginLoad(); NS_IMETHOD EndLoad(); - virtual void ContentChanged(nsIContent* aContent, - nsISupports* aSubContent); - - virtual void ContentAppended(nsIContent* aContainer, - PRInt32 aNewIndexInContainer); - - virtual void ContentInserted(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); - - virtual void ContentReplaced(nsIContent* aContainer, - nsIContent* aOldChild, - nsIContent* aNewChild, - PRInt32 aIndexInContainer); - - virtual void ContentWillBeRemoved(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); - - virtual void ContentHasBeenRemoved(nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); + NS_IMETHOD ContentChanged(nsIContent* aContent, + nsISupports* aSubContent); + NS_IMETHOD AttributeChanged(nsIContent* aChild, + nsIAtom* aAttribute); + NS_IMETHOD ContentAppended(nsIContent* aContainer, + PRInt32 aNewIndexInContainer); + NS_IMETHOD ContentInserted(nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer); + NS_IMETHOD ContentReplaced(nsIContent* aContainer, + nsIContent* aOldChild, + nsIContent* aNewChild, + PRInt32 aIndexInContainer); + NS_IMETHOD ContentRemoved(nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer); /** * Returns the Selection Object diff --git a/mozilla/layout/base/src/nsPresShell.cpp b/mozilla/layout/base/src/nsPresShell.cpp index 1d18b3a6951..bbd669d0180 100644 --- a/mozilla/layout/base/src/nsPresShell.cpp +++ b/mozilla/layout/base/src/nsPresShell.cpp @@ -178,14 +178,10 @@ public: nsIContent* aOldChild, nsIContent* aNewChild, PRInt32 aIndexInContainer); - NS_IMETHOD ContentWillBeRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); - NS_IMETHOD ContentHasBeenRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer); + NS_IMETHOD ContentRemoved(nsIDocument *aDocument, + nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer); NS_IMETHOD StyleSheetAdded(nsIDocument *aDocument, nsIStyleSheet* aStyleSheet); NS_IMETHOD DocumentWillBeDestroyed(nsIDocument *aDocument); @@ -791,25 +787,11 @@ PresShell::ContentReplaced(nsIDocument* aDocument, #endif } -// XXX keep this? NS_IMETHODIMP -PresShell::ContentWillBeRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) -{ - NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, - ("PresShell::ContentWillBeRemoved: container=%p[%s] child=%p[%s][%d]", - aContainer, ContentTag(aContainer, 0), - aChild, ContentTag(aChild, 1), aIndexInContainer)); - return NS_OK; -} - -NS_IMETHODIMP -PresShell::ContentHasBeenRemoved(nsIDocument *aDocument, - nsIContent* aContainer, - nsIContent* aChild, - PRInt32 aIndexInContainer) +PresShell::ContentRemoved(nsIDocument *aDocument, + nsIContent* aContainer, + nsIContent* aChild, + PRInt32 aIndexInContainer) { #ifdef FRAME_CONSTRUCTION nsresult rv = mPresContext->ContentRemoved(aDocument, aContainer, @@ -822,7 +804,7 @@ PresShell::ContentHasBeenRemoved(nsIDocument *aDocument, nsIFrame* frame = FindFrameWithContent(aContainer); NS_PRECONDITION(nsnull != frame, "null frame"); NS_FRAME_LOG(NS_FRAME_TRACE_CALLS, - ("PresShell::ContentHasBeenRemoved: container=%p child=%p[%d] frame=%p", + ("PresShell::ContentDeleted: container=%p child=%p[%d] frame=%p", aContainer, aChild, aIndexInContainer, frame)); frame->ContentDeleted(this, mPresContext, aContainer, aChild, aIndexInContainer);