From a6adfea707730a6df90950352b976dde9bb88280 Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Fri, 15 Oct 1999 23:16:45 +0000 Subject: [PATCH] Added namespace ID to the AttributeChanged notification Part fo the fix for Bug 15153 r=troy --- content/base/public/nsIDocument.h | 1 + content/base/public/nsIDocumentObserver.h | 1 + content/base/src/nsContentList.h | 1 + content/base/src/nsDocument.cpp | 4 +++- content/base/src/nsDocument.h | 1 + content/base/src/nsGenericElement.cpp | 4 ++-- content/base/src/nsStyleSet.cpp | 4 +++- layout/base/nsCSSFrameConstructor.h | 1 + layout/base/nsPresShell.cpp | 4 +++- layout/base/public/nsIDocument.h | 1 + layout/base/public/nsIDocumentObserver.h | 1 + layout/base/public/nsIFrame.h | 1 + layout/base/public/nsIFrameManager.h | 2 ++ layout/base/public/nsIStyleFrameConstruction.h | 1 + layout/base/public/nsIStyleSet.h | 1 + layout/base/src/nsContentList.h | 1 + layout/base/src/nsDocument.cpp | 4 +++- layout/base/src/nsDocument.h | 1 + layout/base/src/nsGenericElement.cpp | 4 ++-- layout/base/src/nsStyleSet.cpp | 4 +++- layout/forms/nsFileControlFrame.cpp | 3 ++- layout/forms/nsFileControlFrame.h | 1 + layout/forms/nsTextControlFrame.h | 1 + layout/generic/nsBlockFrame.cpp | 3 ++- layout/generic/nsBlockFrame.h | 1 + layout/generic/nsBlockReflowState.cpp | 3 ++- layout/generic/nsBlockReflowState.h | 3 ++- layout/generic/nsFrame.cpp | 1 + layout/generic/nsFrame.h | 1 + layout/generic/nsFrameFrame.cpp | 2 ++ layout/generic/nsGfxScrollFrame.cpp | 2 ++ layout/generic/nsIFrame.h | 1 + layout/generic/nsImageFrame.cpp | 5 +++-- layout/generic/nsImageFrame.h | 1 + layout/generic/nsImageMap.cpp | 1 + layout/generic/nsImageMap.h | 1 + layout/html/base/src/nsBlockFrame.cpp | 3 ++- layout/html/base/src/nsBlockFrame.h | 1 + layout/html/base/src/nsBlockReflowState.cpp | 3 ++- layout/html/base/src/nsBlockReflowState.h | 3 ++- layout/html/base/src/nsFrame.cpp | 1 + layout/html/base/src/nsFrame.h | 1 + layout/html/base/src/nsGfxScrollFrame.cpp | 2 ++ layout/html/base/src/nsImageFrame.cpp | 5 +++-- layout/html/base/src/nsImageFrame.h | 1 + layout/html/base/src/nsImageMap.cpp | 1 + layout/html/base/src/nsImageMap.h | 1 + layout/html/base/src/nsPresShell.cpp | 4 +++- layout/html/document/src/nsFrameFrame.cpp | 2 ++ layout/html/forms/src/nsCheckboxControlFrame.cpp | 3 ++- layout/html/forms/src/nsCheckboxControlFrame.h | 1 + layout/html/forms/src/nsFileControlFrame.cpp | 3 ++- layout/html/forms/src/nsFileControlFrame.h | 1 + layout/html/forms/src/nsGfxTextControlFrame.cpp | 4 +++- layout/html/forms/src/nsGfxTextControlFrame.h | 2 ++ layout/html/forms/src/nsNativeButtonControlFrame.cpp | 3 ++- layout/html/forms/src/nsNativeButtonControlFrame.h | 1 + layout/html/forms/src/nsNativeCheckboxControlFram.cpp | 3 ++- layout/html/forms/src/nsNativeCheckboxControlFram.h | 1 + layout/html/forms/src/nsNativeFormControlFrame.cpp | 1 + layout/html/forms/src/nsNativeFormControlFrame.h | 1 + layout/html/forms/src/nsNativeRadioControlFrame.cpp | 3 ++- layout/html/forms/src/nsNativeRadioControlFrame.h | 1 + layout/html/forms/src/nsNativeSelectControlFrame.cpp | 2 ++ layout/html/forms/src/nsNativeTextControlFrame.cpp | 7 ++++--- layout/html/forms/src/nsNativeTextControlFrame.h | 1 + layout/html/forms/src/nsSelectControlFrame.cpp | 2 ++ layout/html/forms/src/nsTextControlFrame.h | 1 + layout/html/style/src/nsCSSFrameConstructor.h | 1 + layout/style/nsStyleSet.cpp | 4 +++- layout/xul/base/src/nsBoxFrame.cpp | 3 ++- layout/xul/base/src/nsBoxFrame.h | 1 + layout/xul/base/src/nsDeckFrame.cpp | 3 ++- layout/xul/base/src/nsDeckFrame.h | 1 + layout/xul/base/src/nsMenuFrame.cpp | 1 + layout/xul/base/src/nsMenuFrame.h | 1 + layout/xul/base/src/nsProgressMeterFrame.cpp | 3 ++- layout/xul/base/src/nsProgressMeterFrame.h | 1 + layout/xul/base/src/nsScrollbarFrame.cpp | 5 +++-- layout/xul/base/src/nsScrollbarFrame.h | 1 + layout/xul/base/src/nsSliderFrame.cpp | 3 ++- layout/xul/base/src/nsSliderFrame.h | 1 + layout/xul/base/src/nsSplitterFrame.cpp | 5 +++-- layout/xul/base/src/nsSplitterFrame.h | 1 + layout/xul/base/src/nsTitledButtonFrame.cpp | 1 + layout/xul/base/src/nsTitledButtonFrame.h | 1 + layout/xul/base/src/nsToolbarFrame.cpp | 4 ++-- layout/xul/base/src/nsToolbarFrame.h | 1 + layout/xul/base/src/nsTreeCellFrame.cpp | 3 ++- layout/xul/base/src/nsTreeCellFrame.h | 1 + 90 files changed, 145 insertions(+), 42 deletions(-) diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h index 0f2ebb11b241..97d42d596109 100644 --- a/content/base/public/nsIDocument.h +++ b/content/base/public/nsIDocument.h @@ -249,6 +249,7 @@ public: NS_IMETHOD ContentStatesChanged(nsIContent* aContent1, nsIContent* aContent2) = 0; NS_IMETHOD AttributeChanged(nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) = 0; // See nsStyleConsts fot hint values NS_IMETHOD ContentAppended(nsIContent* aContainer, diff --git a/content/base/public/nsIDocumentObserver.h b/content/base/public/nsIDocumentObserver.h index c478d56a0b00..eb756d95bb7b 100644 --- a/content/base/public/nsIDocumentObserver.h +++ b/content/base/public/nsIDocumentObserver.h @@ -132,6 +132,7 @@ public: */ NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) = 0; // See nsStyleConsts fot hint values diff --git a/content/base/src/nsContentList.h b/content/base/src/nsContentList.h index d05964f87e73..1541d12d45d6 100644 --- a/content/base/src/nsContentList.h +++ b/content/base/src/nsContentList.h @@ -77,6 +77,7 @@ public: nsIContent* aContent2) { return NS_OK; } NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { return NS_OK; } NS_IMETHOD ContentAppended(nsIDocument *aDocument, diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 0e4e1b7a46bd..b0767f4baaa3 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -145,6 +145,7 @@ public: nsIContent* aContent2) { return NS_OK; } NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { return NS_OK; } NS_IMETHOD ContentAppended(nsIDocument *aDocument, @@ -1594,6 +1595,7 @@ nsDocument::ContentRemoved(nsIContent* aContainer, NS_IMETHODIMP nsDocument::AttributeChanged(nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -1602,7 +1604,7 @@ nsDocument::AttributeChanged(nsIContent* aChild, // observers remove themselves during the loop. for (i = 0; i < mObservers.Count(); i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; - observer->AttributeChanged(this, aChild, aAttribute, aHint); + observer->AttributeChanged(this, aChild, aNameSpaceID, aAttribute, aHint); // Make sure that the observer didn't remove itself during the // notification. If it did, update our index and count. if (observer != (nsIDocumentObserver*)mObservers[i]) { diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index 76c94b8880ad..d9cba703f079 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -272,6 +272,7 @@ public: nsISupports* aSubContent); NS_IMETHOD ContentStatesChanged(nsIContent* aContent1, nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIContent* aContainer, diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index 0356496ec42d..085ed61d7389 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -1859,7 +1859,7 @@ nsGenericContainerElement::SetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, } if (NS_SUCCEEDED(rv) && aNotify && (nsnull != mDocument)) { - mDocument->AttributeChanged(mContent, aName, NS_STYLE_HINT_UNKNOWN); + mDocument->AttributeChanged(mContent, aNameSpaceID, aName, NS_STYLE_HINT_UNKNOWN); } return rv; @@ -1933,7 +1933,7 @@ nsGenericContainerElement::UnsetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, } if (NS_SUCCEEDED(rv) && found && aNotify && (nsnull != mDocument)) { - mDocument->AttributeChanged(mContent, aName, NS_STYLE_HINT_UNKNOWN); + mDocument->AttributeChanged(mContent, aNameSpaceID, aName, NS_STYLE_HINT_UNKNOWN); } } diff --git a/content/base/src/nsStyleSet.cpp b/content/base/src/nsStyleSet.cpp index 598a6bd09510..865266a09bc4 100644 --- a/content/base/src/nsStyleSet.cpp +++ b/content/base/src/nsStyleSet.cpp @@ -126,6 +126,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); // See nsStyleConsts fot hint values @@ -982,11 +983,12 @@ StyleSetImpl::ContentStatesChanged(nsIPresContext* aPresContext, NS_IMETHODIMP StyleSetImpl::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { return mFrameConstructor->AttributeChanged(aPresContext, aContent, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); } diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h index e37b16cac1c7..f1d161344915 100644 --- a/layout/base/nsCSSFrameConstructor.h +++ b/layout/base/nsCSSFrameConstructor.h @@ -89,6 +89,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 5b463d37f3fc..92891cb914ac 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -273,6 +273,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, @@ -1772,13 +1773,14 @@ PresShell::ContentStatesChanged(nsIDocument* aDocument, NS_IMETHODIMP PresShell::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { NS_PRECONDITION(nsnull != mRootFrame, "null root frame"); EnterReflowLock(); - nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aAttribute, aHint); + nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aNameSpaceID, aAttribute, aHint); VERIFY_STYLE_TREE; ExitReflowLock(); return rv; diff --git a/layout/base/public/nsIDocument.h b/layout/base/public/nsIDocument.h index 0f2ebb11b241..97d42d596109 100644 --- a/layout/base/public/nsIDocument.h +++ b/layout/base/public/nsIDocument.h @@ -249,6 +249,7 @@ public: NS_IMETHOD ContentStatesChanged(nsIContent* aContent1, nsIContent* aContent2) = 0; NS_IMETHOD AttributeChanged(nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) = 0; // See nsStyleConsts fot hint values NS_IMETHOD ContentAppended(nsIContent* aContainer, diff --git a/layout/base/public/nsIDocumentObserver.h b/layout/base/public/nsIDocumentObserver.h index c478d56a0b00..eb756d95bb7b 100644 --- a/layout/base/public/nsIDocumentObserver.h +++ b/layout/base/public/nsIDocumentObserver.h @@ -132,6 +132,7 @@ public: */ NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) = 0; // See nsStyleConsts fot hint values diff --git a/layout/base/public/nsIFrame.h b/layout/base/public/nsIFrame.h index d20abe9058f0..a29d234ae763 100644 --- a/layout/base/public/nsIFrame.h +++ b/layout/base/public/nsIFrame.h @@ -530,6 +530,7 @@ public: */ NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) = 0; diff --git a/layout/base/public/nsIFrameManager.h b/layout/base/public/nsIFrameManager.h index cd4ea9b89074..893b47092eab 100644 --- a/layout/base/public/nsIFrameManager.h +++ b/layout/base/public/nsIFrameManager.h @@ -112,6 +112,8 @@ public: // Re-resolve style contexts for frame tree NS_IMETHOD ComputeStyleChangeFor(nsIPresContext& aPresContext, nsIFrame* aFrame, + PRInt32 aAttrNameSpaceID, + nsIAtom* aAttribute, nsStyleChangeList& aChangeList, PRInt32 aMinChange, PRInt32& aTopLevelChange) = 0; diff --git a/layout/base/public/nsIStyleFrameConstruction.h b/layout/base/public/nsIStyleFrameConstruction.h index b1e7803d15bd..b71f1bd66bf7 100644 --- a/layout/base/public/nsIStyleFrameConstruction.h +++ b/layout/base/public/nsIStyleFrameConstruction.h @@ -77,6 +77,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) = 0; diff --git a/layout/base/public/nsIStyleSet.h b/layout/base/public/nsIStyleSet.h index 5f121ebd256b..8dd0cc1d82db 100644 --- a/layout/base/public/nsIStyleSet.h +++ b/layout/base/public/nsIStyleSet.h @@ -136,6 +136,7 @@ public: nsIContent* aContent2) = 0; NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) = 0; // See nsStyleConsts fot hint values diff --git a/layout/base/src/nsContentList.h b/layout/base/src/nsContentList.h index d05964f87e73..1541d12d45d6 100644 --- a/layout/base/src/nsContentList.h +++ b/layout/base/src/nsContentList.h @@ -77,6 +77,7 @@ public: nsIContent* aContent2) { return NS_OK; } NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { return NS_OK; } NS_IMETHOD ContentAppended(nsIDocument *aDocument, diff --git a/layout/base/src/nsDocument.cpp b/layout/base/src/nsDocument.cpp index 0e4e1b7a46bd..b0767f4baaa3 100644 --- a/layout/base/src/nsDocument.cpp +++ b/layout/base/src/nsDocument.cpp @@ -145,6 +145,7 @@ public: nsIContent* aContent2) { return NS_OK; } NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { return NS_OK; } NS_IMETHOD ContentAppended(nsIDocument *aDocument, @@ -1594,6 +1595,7 @@ nsDocument::ContentRemoved(nsIContent* aContainer, NS_IMETHODIMP nsDocument::AttributeChanged(nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -1602,7 +1604,7 @@ nsDocument::AttributeChanged(nsIContent* aChild, // observers remove themselves during the loop. for (i = 0; i < mObservers.Count(); i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; - observer->AttributeChanged(this, aChild, aAttribute, aHint); + observer->AttributeChanged(this, aChild, aNameSpaceID, aAttribute, aHint); // Make sure that the observer didn't remove itself during the // notification. If it did, update our index and count. if (observer != (nsIDocumentObserver*)mObservers[i]) { diff --git a/layout/base/src/nsDocument.h b/layout/base/src/nsDocument.h index 76c94b8880ad..d9cba703f079 100644 --- a/layout/base/src/nsDocument.h +++ b/layout/base/src/nsDocument.h @@ -272,6 +272,7 @@ public: nsISupports* aSubContent); NS_IMETHOD ContentStatesChanged(nsIContent* aContent1, nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIContent* aContainer, diff --git a/layout/base/src/nsGenericElement.cpp b/layout/base/src/nsGenericElement.cpp index 0356496ec42d..085ed61d7389 100644 --- a/layout/base/src/nsGenericElement.cpp +++ b/layout/base/src/nsGenericElement.cpp @@ -1859,7 +1859,7 @@ nsGenericContainerElement::SetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, } if (NS_SUCCEEDED(rv) && aNotify && (nsnull != mDocument)) { - mDocument->AttributeChanged(mContent, aName, NS_STYLE_HINT_UNKNOWN); + mDocument->AttributeChanged(mContent, aNameSpaceID, aName, NS_STYLE_HINT_UNKNOWN); } return rv; @@ -1933,7 +1933,7 @@ nsGenericContainerElement::UnsetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName, } if (NS_SUCCEEDED(rv) && found && aNotify && (nsnull != mDocument)) { - mDocument->AttributeChanged(mContent, aName, NS_STYLE_HINT_UNKNOWN); + mDocument->AttributeChanged(mContent, aNameSpaceID, aName, NS_STYLE_HINT_UNKNOWN); } } diff --git a/layout/base/src/nsStyleSet.cpp b/layout/base/src/nsStyleSet.cpp index 598a6bd09510..865266a09bc4 100644 --- a/layout/base/src/nsStyleSet.cpp +++ b/layout/base/src/nsStyleSet.cpp @@ -126,6 +126,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); // See nsStyleConsts fot hint values @@ -982,11 +983,12 @@ StyleSetImpl::ContentStatesChanged(nsIPresContext* aPresContext, NS_IMETHODIMP StyleSetImpl::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { return mFrameConstructor->AttributeChanged(aPresContext, aContent, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); } diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index c47605bd2713..fb8a0850a118 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -395,6 +395,7 @@ nsFileControlFrame::GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValues, NS_IMETHODIMP nsFileControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -409,7 +410,7 @@ nsFileControlFrame::AttributeChanged(nsIPresContext* aPresContext, //mTextContent->SetHTMLAttribute(nsHTMLAtoms::disabled, val, PR_TRUE); } - return nsAreaFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } NS_IMETHODIMP diff --git a/layout/forms/nsFileControlFrame.h b/layout/forms/nsFileControlFrame.h index c38f67e4a9dc..6d4945fc3820 100644 --- a/layout/forms/nsFileControlFrame.h +++ b/layout/forms/nsFileControlFrame.h @@ -66,6 +66,7 @@ public: NS_IMETHOD GetFrameForPoint(const nsPoint& aPoint, nsIFrame** aFrame); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h index d94ff7ff3fb3..ab5e049e08c2 100644 --- a/layout/forms/nsTextControlFrame.h +++ b/layout/forms/nsTextControlFrame.h @@ -93,6 +93,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint)=0; diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index affe7c27ac62..82b5d7e8814f 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -2654,11 +2654,12 @@ nsBlockFrame::UpdateSpaceManager(nsIPresContext* aPresContext, NS_IMETHODIMP nsBlockFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h index a09efc907e12..de47caeaad39 100644 --- a/layout/generic/nsBlockFrame.h +++ b/layout/generic/nsBlockFrame.h @@ -113,6 +113,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp index affe7c27ac62..82b5d7e8814f 100644 --- a/layout/generic/nsBlockReflowState.cpp +++ b/layout/generic/nsBlockReflowState.cpp @@ -2654,11 +2654,12 @@ nsBlockFrame::UpdateSpaceManager(nsIPresContext* aPresContext, NS_IMETHODIMP nsBlockFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h index affe7c27ac62..82b5d7e8814f 100644 --- a/layout/generic/nsBlockReflowState.h +++ b/layout/generic/nsBlockReflowState.h @@ -2654,11 +2654,12 @@ nsBlockFrame::UpdateSpaceManager(nsIPresContext* aPresContext, NS_IMETHODIMP nsBlockFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 5b941f80df3c..276411312096 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -1337,6 +1337,7 @@ nsFrame::ContentChanged(nsIPresContext* aPresContext, NS_IMETHODIMP nsFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index 2a2ce71371d4..471153dd40f6 100644 --- a/layout/generic/nsFrame.h +++ b/layout/generic/nsFrame.h @@ -193,6 +193,7 @@ public: nsISupports* aSubContent); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentStateChanged(nsIPresContext* aPresContext, diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp index 057ed42e42cb..2eadeb20c713 100644 --- a/layout/generic/nsFrameFrame.cpp +++ b/layout/generic/nsFrameFrame.cpp @@ -110,6 +110,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD VerifyTree() const; @@ -389,6 +390,7 @@ nsHTMLFrameOuterFrame::VerifyTree() const NS_IMETHODIMP nsHTMLFrameOuterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 7f54608cd0ef..4a3d37d29597 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -88,6 +88,7 @@ public: nsIContent* aContent2) { return NS_OK; } NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, @@ -674,6 +675,7 @@ nsGfxScrollFrameInner::ScrollPositionDidChange(nsIScrollableView* aScrollable, n NS_IMETHODIMP nsGfxScrollFrameInner::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index d20abe9058f0..a29d234ae763 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -530,6 +530,7 @@ public: */ NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) = 0; diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index 574c92135ca4..429135e71bf5 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -827,18 +827,19 @@ nsImageFrame::GetCursor(nsIPresContext& aPresContext, NS_IMETHODIMP nsImageFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsLeafFrame::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; } if (nsHTMLAtoms::src == aAttribute) { nsAutoString oldSRC, newSRC; mImageLoader.GetURLSpec(oldSRC); - aChild->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::src, newSRC); + aChild->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::src, newSRC); if (!oldSRC.Equals(newSRC)) { #ifdef NOISY_IMAGE_LOADING ListTag(stdout); diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h index 8b701022d9d2..a950ef108b11 100644 --- a/layout/generic/nsImageFrame.h +++ b/layout/generic/nsImageFrame.h @@ -57,6 +57,7 @@ public: PRInt32& aCursor); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD GetFrameType(nsIAtom** aResult) const; diff --git a/layout/generic/nsImageMap.cpp b/layout/generic/nsImageMap.cpp index 5f1c16ac31f2..c78087e33835 100644 --- a/layout/generic/nsImageMap.cpp +++ b/layout/generic/nsImageMap.cpp @@ -1031,6 +1031,7 @@ nsImageMap::ContentStatesChanged(nsIDocument* aDocument, NS_IMETHODIMP nsImageMap::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/generic/nsImageMap.h b/layout/generic/nsImageMap.h index ba6f1acc0efb..097a12f68f77 100644 --- a/layout/generic/nsImageMap.h +++ b/layout/generic/nsImageMap.h @@ -84,6 +84,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, diff --git a/layout/html/base/src/nsBlockFrame.cpp b/layout/html/base/src/nsBlockFrame.cpp index affe7c27ac62..82b5d7e8814f 100644 --- a/layout/html/base/src/nsBlockFrame.cpp +++ b/layout/html/base/src/nsBlockFrame.cpp @@ -2654,11 +2654,12 @@ nsBlockFrame::UpdateSpaceManager(nsIPresContext* aPresContext, NS_IMETHODIMP nsBlockFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; diff --git a/layout/html/base/src/nsBlockFrame.h b/layout/html/base/src/nsBlockFrame.h index a09efc907e12..de47caeaad39 100644 --- a/layout/html/base/src/nsBlockFrame.h +++ b/layout/html/base/src/nsBlockFrame.h @@ -113,6 +113,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/html/base/src/nsBlockReflowState.cpp b/layout/html/base/src/nsBlockReflowState.cpp index affe7c27ac62..82b5d7e8814f 100644 --- a/layout/html/base/src/nsBlockReflowState.cpp +++ b/layout/html/base/src/nsBlockReflowState.cpp @@ -2654,11 +2654,12 @@ nsBlockFrame::UpdateSpaceManager(nsIPresContext* aPresContext, NS_IMETHODIMP nsBlockFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; diff --git a/layout/html/base/src/nsBlockReflowState.h b/layout/html/base/src/nsBlockReflowState.h index affe7c27ac62..82b5d7e8814f 100644 --- a/layout/html/base/src/nsBlockReflowState.h +++ b/layout/html/base/src/nsBlockReflowState.h @@ -2654,11 +2654,12 @@ nsBlockFrame::UpdateSpaceManager(nsIPresContext* aPresContext, NS_IMETHODIMP nsBlockFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; diff --git a/layout/html/base/src/nsFrame.cpp b/layout/html/base/src/nsFrame.cpp index 5b941f80df3c..276411312096 100644 --- a/layout/html/base/src/nsFrame.cpp +++ b/layout/html/base/src/nsFrame.cpp @@ -1337,6 +1337,7 @@ nsFrame::ContentChanged(nsIPresContext* aPresContext, NS_IMETHODIMP nsFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/html/base/src/nsFrame.h b/layout/html/base/src/nsFrame.h index 2a2ce71371d4..471153dd40f6 100644 --- a/layout/html/base/src/nsFrame.h +++ b/layout/html/base/src/nsFrame.h @@ -193,6 +193,7 @@ public: nsISupports* aSubContent); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentStateChanged(nsIPresContext* aPresContext, diff --git a/layout/html/base/src/nsGfxScrollFrame.cpp b/layout/html/base/src/nsGfxScrollFrame.cpp index 7f54608cd0ef..4a3d37d29597 100644 --- a/layout/html/base/src/nsGfxScrollFrame.cpp +++ b/layout/html/base/src/nsGfxScrollFrame.cpp @@ -88,6 +88,7 @@ public: nsIContent* aContent2) { return NS_OK; } NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, @@ -674,6 +675,7 @@ nsGfxScrollFrameInner::ScrollPositionDidChange(nsIScrollableView* aScrollable, n NS_IMETHODIMP nsGfxScrollFrameInner::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/html/base/src/nsImageFrame.cpp b/layout/html/base/src/nsImageFrame.cpp index 574c92135ca4..429135e71bf5 100644 --- a/layout/html/base/src/nsImageFrame.cpp +++ b/layout/html/base/src/nsImageFrame.cpp @@ -827,18 +827,19 @@ nsImageFrame::GetCursor(nsIPresContext& aPresContext, NS_IMETHODIMP nsImageFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsLeafFrame::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; } if (nsHTMLAtoms::src == aAttribute) { nsAutoString oldSRC, newSRC; mImageLoader.GetURLSpec(oldSRC); - aChild->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::src, newSRC); + aChild->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::src, newSRC); if (!oldSRC.Equals(newSRC)) { #ifdef NOISY_IMAGE_LOADING ListTag(stdout); diff --git a/layout/html/base/src/nsImageFrame.h b/layout/html/base/src/nsImageFrame.h index 8b701022d9d2..a950ef108b11 100644 --- a/layout/html/base/src/nsImageFrame.h +++ b/layout/html/base/src/nsImageFrame.h @@ -57,6 +57,7 @@ public: PRInt32& aCursor); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD GetFrameType(nsIAtom** aResult) const; diff --git a/layout/html/base/src/nsImageMap.cpp b/layout/html/base/src/nsImageMap.cpp index 5f1c16ac31f2..c78087e33835 100644 --- a/layout/html/base/src/nsImageMap.cpp +++ b/layout/html/base/src/nsImageMap.cpp @@ -1031,6 +1031,7 @@ nsImageMap::ContentStatesChanged(nsIDocument* aDocument, NS_IMETHODIMP nsImageMap::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/html/base/src/nsImageMap.h b/layout/html/base/src/nsImageMap.h index ba6f1acc0efb..097a12f68f77 100644 --- a/layout/html/base/src/nsImageMap.h +++ b/layout/html/base/src/nsImageMap.h @@ -84,6 +84,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, diff --git a/layout/html/base/src/nsPresShell.cpp b/layout/html/base/src/nsPresShell.cpp index 5b463d37f3fc..92891cb914ac 100644 --- a/layout/html/base/src/nsPresShell.cpp +++ b/layout/html/base/src/nsPresShell.cpp @@ -273,6 +273,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, @@ -1772,13 +1773,14 @@ PresShell::ContentStatesChanged(nsIDocument* aDocument, NS_IMETHODIMP PresShell::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { NS_PRECONDITION(nsnull != mRootFrame, "null root frame"); EnterReflowLock(); - nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aAttribute, aHint); + nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aNameSpaceID, aAttribute, aHint); VERIFY_STYLE_TREE; ExitReflowLock(); return rv; diff --git a/layout/html/document/src/nsFrameFrame.cpp b/layout/html/document/src/nsFrameFrame.cpp index 057ed42e42cb..2eadeb20c713 100644 --- a/layout/html/document/src/nsFrameFrame.cpp +++ b/layout/html/document/src/nsFrameFrame.cpp @@ -110,6 +110,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD VerifyTree() const; @@ -389,6 +390,7 @@ nsHTMLFrameOuterFrame::VerifyTree() const NS_IMETHODIMP nsHTMLFrameOuterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/html/forms/src/nsCheckboxControlFrame.cpp b/layout/html/forms/src/nsCheckboxControlFrame.cpp index 78767e09d99a..8696f422b6d0 100644 --- a/layout/html/forms/src/nsCheckboxControlFrame.cpp +++ b/layout/html/forms/src/nsCheckboxControlFrame.cpp @@ -162,6 +162,7 @@ nsCheckboxControlFrame::PostCreateWidget(nsIPresContext* aPresContext, nscoord& NS_IMETHODIMP nsCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -182,7 +183,7 @@ nsCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext, } } else - return nsNativeFormControlFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + return nsNativeFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); return NS_OK; } diff --git a/layout/html/forms/src/nsCheckboxControlFrame.h b/layout/html/forms/src/nsCheckboxControlFrame.h index 3518887b9574..0a9d2e161723 100644 --- a/layout/html/forms/src/nsCheckboxControlFrame.h +++ b/layout/html/forms/src/nsCheckboxControlFrame.h @@ -78,6 +78,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) ; NS_IMETHOD HandleEvent(nsIPresContext& aPresContext, diff --git a/layout/html/forms/src/nsFileControlFrame.cpp b/layout/html/forms/src/nsFileControlFrame.cpp index c47605bd2713..fb8a0850a118 100644 --- a/layout/html/forms/src/nsFileControlFrame.cpp +++ b/layout/html/forms/src/nsFileControlFrame.cpp @@ -395,6 +395,7 @@ nsFileControlFrame::GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValues, NS_IMETHODIMP nsFileControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -409,7 +410,7 @@ nsFileControlFrame::AttributeChanged(nsIPresContext* aPresContext, //mTextContent->SetHTMLAttribute(nsHTMLAtoms::disabled, val, PR_TRUE); } - return nsAreaFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } NS_IMETHODIMP diff --git a/layout/html/forms/src/nsFileControlFrame.h b/layout/html/forms/src/nsFileControlFrame.h index c38f67e4a9dc..6d4945fc3820 100644 --- a/layout/html/forms/src/nsFileControlFrame.h +++ b/layout/html/forms/src/nsFileControlFrame.h @@ -66,6 +66,7 @@ public: NS_IMETHOD GetFrameForPoint(const nsPoint& aPoint, nsIFrame** aFrame); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/html/forms/src/nsGfxTextControlFrame.cpp b/layout/html/forms/src/nsGfxTextControlFrame.cpp index b1eabf54a48e..42f9565ff47d 100644 --- a/layout/html/forms/src/nsGfxTextControlFrame.cpp +++ b/layout/html/forms/src/nsGfxTextControlFrame.cpp @@ -367,6 +367,7 @@ nsGfxTextControlFrame::GetText(nsString* aText, PRBool aInitialValue) NS_IMETHODIMP nsGfxTextControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -455,7 +456,7 @@ nsGfxTextControlFrame::AttributeChanged(nsIPresContext* aPresContext, // Allow the base class to handle common attributes supported // by all form elements... else { - result = nsFormControlFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + result = nsFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } return result; @@ -1711,6 +1712,7 @@ NS_IMETHODIMP nsEnderDocumentObserver::ContentStatesChanged(nsIDocument* aDocume NS_IMETHODIMP nsEnderDocumentObserver::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { return NS_OK; } diff --git a/layout/html/forms/src/nsGfxTextControlFrame.h b/layout/html/forms/src/nsGfxTextControlFrame.h index ac2bdf7fa84a..1cc5a703756e 100644 --- a/layout/html/forms/src/nsGfxTextControlFrame.h +++ b/layout/html/forms/src/nsGfxTextControlFrame.h @@ -123,6 +123,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, @@ -314,6 +315,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/html/forms/src/nsNativeButtonControlFrame.cpp b/layout/html/forms/src/nsNativeButtonControlFrame.cpp index 3a7598379e64..030b68c372d4 100644 --- a/layout/html/forms/src/nsNativeButtonControlFrame.cpp +++ b/layout/html/forms/src/nsNativeButtonControlFrame.cpp @@ -44,6 +44,7 @@ NS_NewNativeButtonControlFrame(nsIFrame** aNewFrame) NS_IMETHODIMP nsNativeButtonControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -67,7 +68,7 @@ nsNativeButtonControlFrame::AttributeChanged(nsIPresContext* aPresContext, // Allow the base class to handle common attributes supported // by all form elements... else { - result = Inherited::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + result = Inherited::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } } return result; diff --git a/layout/html/forms/src/nsNativeButtonControlFrame.h b/layout/html/forms/src/nsNativeButtonControlFrame.h index a479feaadcc1..b489bb428f3a 100644 --- a/layout/html/forms/src/nsNativeButtonControlFrame.h +++ b/layout/html/forms/src/nsNativeButtonControlFrame.h @@ -31,6 +31,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/html/forms/src/nsNativeCheckboxControlFram.cpp b/layout/html/forms/src/nsNativeCheckboxControlFram.cpp index a96d8f55e45f..629513db99e2 100644 --- a/layout/html/forms/src/nsNativeCheckboxControlFram.cpp +++ b/layout/html/forms/src/nsNativeCheckboxControlFram.cpp @@ -99,6 +99,7 @@ nsNativeCheckboxControlFrame::PostCreateWidget(nsIPresContext* aPresContext, nsc NS_IMETHODIMP nsNativeCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -121,7 +122,7 @@ nsNativeCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext, // Allow the base class to handle common attributes supported // by all form elements... else { - result = Inherited::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + result = Inherited::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } } return result; diff --git a/layout/html/forms/src/nsNativeCheckboxControlFram.h b/layout/html/forms/src/nsNativeCheckboxControlFram.h index eae598eec2f0..68a7f400094c 100644 --- a/layout/html/forms/src/nsNativeCheckboxControlFram.h +++ b/layout/html/forms/src/nsNativeCheckboxControlFram.h @@ -32,6 +32,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/html/forms/src/nsNativeFormControlFrame.cpp b/layout/html/forms/src/nsNativeFormControlFrame.cpp index 90a4db40b365..388b69db5de1 100644 --- a/layout/html/forms/src/nsNativeFormControlFrame.cpp +++ b/layout/html/forms/src/nsNativeFormControlFrame.cpp @@ -166,6 +166,7 @@ nsNativeFormControlFrame::Reflow(nsIPresContext& aPresContext, NS_IMETHODIMP nsNativeFormControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/html/forms/src/nsNativeFormControlFrame.h b/layout/html/forms/src/nsNativeFormControlFrame.h index eb8b1c723865..d409efa6a38f 100644 --- a/layout/html/forms/src/nsNativeFormControlFrame.h +++ b/layout/html/forms/src/nsNativeFormControlFrame.h @@ -45,6 +45,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); /** diff --git a/layout/html/forms/src/nsNativeRadioControlFrame.cpp b/layout/html/forms/src/nsNativeRadioControlFrame.cpp index c0239bfacc18..a0bdfdb190e2 100644 --- a/layout/html/forms/src/nsNativeRadioControlFrame.cpp +++ b/layout/html/forms/src/nsNativeRadioControlFrame.cpp @@ -117,6 +117,7 @@ nsNativeRadioControlFrame::PostCreateWidget(nsIPresContext* aPresContext, nscoor NS_IMETHODIMP nsNativeRadioControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -140,7 +141,7 @@ nsNativeRadioControlFrame::AttributeChanged(nsIPresContext* aPresContext, // Allow the base class to handle common attributes supported // by all form elements... else { - result = Inherited::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + result = Inherited::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } } return result; diff --git a/layout/html/forms/src/nsNativeRadioControlFrame.h b/layout/html/forms/src/nsNativeRadioControlFrame.h index f7d7faabf63a..96fa55cdf75a 100644 --- a/layout/html/forms/src/nsNativeRadioControlFrame.h +++ b/layout/html/forms/src/nsNativeRadioControlFrame.h @@ -41,6 +41,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/html/forms/src/nsNativeSelectControlFrame.cpp b/layout/html/forms/src/nsNativeSelectControlFrame.cpp index 180ac70017c2..8b01a67da548 100644 --- a/layout/html/forms/src/nsNativeSelectControlFrame.cpp +++ b/layout/html/forms/src/nsNativeSelectControlFrame.cpp @@ -142,6 +142,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); @@ -1219,6 +1220,7 @@ void nsNativeSelectControlFrame::SetOptionSelectedCache(PRInt32 indx, PRBool aVa NS_IMETHODIMP nsNativeSelectControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/html/forms/src/nsNativeTextControlFrame.cpp b/layout/html/forms/src/nsNativeTextControlFrame.cpp index 293a36dfdcd2..7d6ea706714d 100644 --- a/layout/html/forms/src/nsNativeTextControlFrame.cpp +++ b/layout/html/forms/src/nsNativeTextControlFrame.cpp @@ -156,6 +156,7 @@ nsNativeTextControlFrame::GetText(nsString* aText, PRBool aInitialValue) NS_IMETHODIMP nsNativeTextControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { @@ -188,7 +189,7 @@ nsNativeTextControlFrame::AttributeChanged(nsIPresContext* aPresContext, // Allow the base class to handle common attributes supported // by all form elements... else { - result = nsNativeFormControlFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + result = nsNativeFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } NS_RELEASE(text); } @@ -219,12 +220,12 @@ nsNativeTextControlFrame::AttributeChanged(nsIPresContext* aPresContext, // Allow the base class to handle common attributes supported // by all form elements... else { - result = nsNativeFormControlFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + result = nsNativeFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } NS_RELEASE(textArea); } else { // We didn't get a Text or TextArea. Uh oh... - result = nsNativeFormControlFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + result = nsNativeFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } } } diff --git a/layout/html/forms/src/nsNativeTextControlFrame.h b/layout/html/forms/src/nsNativeTextControlFrame.h index f262dfa9ac12..d19ac1dfbf76 100644 --- a/layout/html/forms/src/nsNativeTextControlFrame.h +++ b/layout/html/forms/src/nsNativeTextControlFrame.h @@ -38,6 +38,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/html/forms/src/nsSelectControlFrame.cpp b/layout/html/forms/src/nsSelectControlFrame.cpp index 9fec9b3357b2..5a9bd0fc8c64 100644 --- a/layout/html/forms/src/nsSelectControlFrame.cpp +++ b/layout/html/forms/src/nsSelectControlFrame.cpp @@ -127,6 +127,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); protected: @@ -1184,6 +1185,7 @@ void nsSelectControlFrame::SetOptionSelected(PRUint32 indx, PRBool aValue) NS_IMETHODIMP nsSelectControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/html/forms/src/nsTextControlFrame.h b/layout/html/forms/src/nsTextControlFrame.h index d94ff7ff3fb3..ab5e049e08c2 100644 --- a/layout/html/forms/src/nsTextControlFrame.h +++ b/layout/html/forms/src/nsTextControlFrame.h @@ -93,6 +93,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint)=0; diff --git a/layout/html/style/src/nsCSSFrameConstructor.h b/layout/html/style/src/nsCSSFrameConstructor.h index e37b16cac1c7..f1d161344915 100644 --- a/layout/html/style/src/nsCSSFrameConstructor.h +++ b/layout/html/style/src/nsCSSFrameConstructor.h @@ -89,6 +89,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp index 598a6bd09510..865266a09bc4 100644 --- a/layout/style/nsStyleSet.cpp +++ b/layout/style/nsStyleSet.cpp @@ -126,6 +126,7 @@ public: nsIContent* aContent2); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); // See nsStyleConsts fot hint values @@ -982,11 +983,12 @@ StyleSetImpl::ContentStatesChanged(nsIPresContext* aPresContext, NS_IMETHODIMP StyleSetImpl::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { return mFrameConstructor->AttributeChanged(aPresContext, aContent, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); } diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp index d6092a33c885..9afcc1d10b5f 100644 --- a/layout/xul/base/src/nsBoxFrame.cpp +++ b/layout/xul/base/src/nsBoxFrame.cpp @@ -1470,11 +1470,12 @@ nsBoxFrame::AppendFrames(nsIPresContext& aPresContext, NS_IMETHODIMP nsBoxFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsHTMLContainerFrame::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; diff --git a/layout/xul/base/src/nsBoxFrame.h b/layout/xul/base/src/nsBoxFrame.h index 7b5ddc128b1f..9c6eacc1e782 100644 --- a/layout/xul/base/src/nsBoxFrame.h +++ b/layout/xul/base/src/nsBoxFrame.h @@ -88,6 +88,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/xul/base/src/nsDeckFrame.cpp b/layout/xul/base/src/nsDeckFrame.cpp index 90c6567f868f..49d30beda310 100644 --- a/layout/xul/base/src/nsDeckFrame.cpp +++ b/layout/xul/base/src/nsDeckFrame.cpp @@ -75,11 +75,12 @@ nsDeckFrame::Init(nsIPresContext& aPresContext, NS_IMETHODIMP nsDeckFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); // if the index changed hide the old element and make the now element visible diff --git a/layout/xul/base/src/nsDeckFrame.h b/layout/xul/base/src/nsDeckFrame.h index ab12791edddd..830d86c331b0 100644 --- a/layout/xul/base/src/nsDeckFrame.h +++ b/layout/xul/base/src/nsDeckFrame.h @@ -47,6 +47,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp index 03869898d0c9..7afc49f4c522 100644 --- a/layout/xul/base/src/nsMenuFrame.cpp +++ b/layout/xul/base/src/nsMenuFrame.cpp @@ -407,6 +407,7 @@ nsMenuFrame::ActivateMenu(PRBool aActivateFlag) NS_IMETHODIMP nsMenuFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/xul/base/src/nsMenuFrame.h b/layout/xul/base/src/nsMenuFrame.h index ad30a7585ca1..f6363b911a40 100644 --- a/layout/xul/base/src/nsMenuFrame.h +++ b/layout/xul/base/src/nsMenuFrame.h @@ -169,6 +169,7 @@ protected: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/xul/base/src/nsProgressMeterFrame.cpp b/layout/xul/base/src/nsProgressMeterFrame.cpp index e5c0c8924120..9e5bb74999df 100644 --- a/layout/xul/base/src/nsProgressMeterFrame.cpp +++ b/layout/xul/base/src/nsProgressMeterFrame.cpp @@ -669,11 +669,12 @@ nsProgressMeterFrame::CalcSize(nsIPresContext& aPresContext, int& width, int& he NS_IMETHODIMP nsProgressMeterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsLeafFrame::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); if (NS_OK != rv) { return rv; } diff --git a/layout/xul/base/src/nsProgressMeterFrame.h b/layout/xul/base/src/nsProgressMeterFrame.h index 4d7525267742..31ddc136a5d2 100644 --- a/layout/xul/base/src/nsProgressMeterFrame.h +++ b/layout/xul/base/src/nsProgressMeterFrame.h @@ -76,6 +76,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/xul/base/src/nsScrollbarFrame.cpp b/layout/xul/base/src/nsScrollbarFrame.cpp index bd5f78410b8c..43b4130a1935 100644 --- a/layout/xul/base/src/nsScrollbarFrame.cpp +++ b/layout/xul/base/src/nsScrollbarFrame.cpp @@ -309,11 +309,12 @@ nsScrollbarFrame::Init(nsIPresContext& aPresContext, NS_IMETHODIMP nsScrollbarFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); // if the current position changes if ( aAttribute == nsXULAtoms::curpos || aAttribute == nsXULAtoms::maxpos || @@ -324,7 +325,7 @@ nsScrollbarFrame::AttributeChanged(nsIPresContext* aPresContext, nsIFrame* slider; nsScrollbarButtonFrame::GetChildWithTag(nsXULAtoms::slider, this, slider); if (slider) - slider->AttributeChanged(aPresContext, aChild, aAttribute, aHint); + slider->AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } return rv; diff --git a/layout/xul/base/src/nsScrollbarFrame.h b/layout/xul/base/src/nsScrollbarFrame.h index 1126e7f6248a..e72081f45aa2 100644 --- a/layout/xul/base/src/nsScrollbarFrame.h +++ b/layout/xul/base/src/nsScrollbarFrame.h @@ -45,6 +45,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp index f218cf4d3abe..64b3625a711c 100644 --- a/layout/xul/base/src/nsSliderFrame.cpp +++ b/layout/xul/base/src/nsSliderFrame.cpp @@ -184,11 +184,12 @@ nsSliderFrame::GetIntegerAttribute(nsIContent* content, nsIAtom* atom, PRInt32 d NS_IMETHODIMP nsSliderFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsHTMLContainerFrame::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); // if the current position changes if (aAttribute == nsXULAtoms::curpos) { CurrentPositionChanged(aPresContext); diff --git a/layout/xul/base/src/nsSliderFrame.h b/layout/xul/base/src/nsSliderFrame.h index 9c62495f0225..ae356151ab10 100644 --- a/layout/xul/base/src/nsSliderFrame.h +++ b/layout/xul/base/src/nsSliderFrame.h @@ -66,6 +66,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp index 3d5f0cf1a164..1fb25917ca4c 100644 --- a/layout/xul/base/src/nsSplitterFrame.cpp +++ b/layout/xul/base/src/nsSplitterFrame.cpp @@ -287,11 +287,12 @@ nsSplitterFrame::GetCursor(nsIPresContext& aPresContext, NS_IMETHODIMP nsSplitterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aAttribute, aHint); + aNameSpaceID, aAttribute, aHint); // if the alignment changed. Let the grippy know if (aAttribute == nsHTMLAtoms::align) { // tell the slider its attribute changed so it can @@ -299,7 +300,7 @@ nsSplitterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIFrame* grippy = nsnull; nsScrollbarButtonFrame::GetChildWithTag(nsXULAtoms::grippy, this, grippy); if (grippy) - grippy->AttributeChanged(aPresContext, aChild, aAttribute, aHint); + grippy->AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); } else if (aAttribute == nsXULAtoms::state) { mImpl->UpdateState(); } diff --git a/layout/xul/base/src/nsSplitterFrame.h b/layout/xul/base/src/nsSplitterFrame.h index 989fead0aeb1..a54a08324656 100644 --- a/layout/xul/base/src/nsSplitterFrame.h +++ b/layout/xul/base/src/nsSplitterFrame.h @@ -46,6 +46,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/xul/base/src/nsTitledButtonFrame.cpp b/layout/xul/base/src/nsTitledButtonFrame.cpp index aed0d1d30242..55df2f42f29f 100644 --- a/layout/xul/base/src/nsTitledButtonFrame.cpp +++ b/layout/xul/base/src/nsTitledButtonFrame.cpp @@ -170,6 +170,7 @@ NS_NewTitledButtonFrame ( nsIFrame** aNewFrame ) NS_IMETHODIMP nsTitledButtonFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { diff --git a/layout/xul/base/src/nsTitledButtonFrame.h b/layout/xul/base/src/nsTitledButtonFrame.h index 49c561d72e9f..66d936a3ae5e 100644 --- a/layout/xul/base/src/nsTitledButtonFrame.h +++ b/layout/xul/base/src/nsTitledButtonFrame.h @@ -48,6 +48,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); diff --git a/layout/xul/base/src/nsToolbarFrame.cpp b/layout/xul/base/src/nsToolbarFrame.cpp index b258e617bbff..704b82a32fdf 100644 --- a/layout/xul/base/src/nsToolbarFrame.cpp +++ b/layout/xul/base/src/nsToolbarFrame.cpp @@ -425,7 +425,7 @@ static void ForceDrawFrame(nsIFrame * aFrame) // NS_IMETHODIMP nsToolbarFrame :: AttributeChanged ( nsIPresContext* aPresContext, nsIContent* aChild, - nsIAtom* aAttribute, PRInt32 aHint) + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { nsresult rv = NS_OK; @@ -439,7 +439,7 @@ nsToolbarFrame :: AttributeChanged ( nsIPresContext* aPresContext, nsIContent* a nsAllocator::Free ( iHateNSString ); } else - rv = nsBoxFrame::AttributeChanged ( aPresContext, aChild, aAttribute, aHint ); + rv = nsBoxFrame::AttributeChanged ( aPresContext, aChild, aNameSpaceID, aAttribute, aHint ); return rv; diff --git a/layout/xul/base/src/nsToolbarFrame.h b/layout/xul/base/src/nsToolbarFrame.h index 07034df03f74..eda28313d75e 100644 --- a/layout/xul/base/src/nsToolbarFrame.h +++ b/layout/xul/base/src/nsToolbarFrame.h @@ -78,6 +78,7 @@ public: nsEventStatus& aEventStatus); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) ; diff --git a/layout/xul/base/src/nsTreeCellFrame.cpp b/layout/xul/base/src/nsTreeCellFrame.cpp index 5b3b4fb75bf4..44e872232d25 100644 --- a/layout/xul/base/src/nsTreeCellFrame.cpp +++ b/layout/xul/base/src/nsTreeCellFrame.cpp @@ -117,10 +117,11 @@ nsTreeCellFrame::Init(nsIPresContext& aPresContext, NS_IMETHODIMP nsTreeCellFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) { - nsresult rv = nsTableCellFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint); + nsresult rv = nsTableCellFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); if (mAnonymousContent && (aAttribute == nsHTMLAtoms::align || aAttribute == nsXULAtoms::crop || aAttribute == nsHTMLAtoms::value)) { diff --git a/layout/xul/base/src/nsTreeCellFrame.h b/layout/xul/base/src/nsTreeCellFrame.h index 91f1fcec42dd..2e7917e9ea01 100644 --- a/layout/xul/base/src/nsTreeCellFrame.h +++ b/layout/xul/base/src/nsTreeCellFrame.h @@ -29,6 +29,7 @@ public: NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint); NS_IMETHOD GetFrameForPoint(const nsPoint& aPoint, // Overridden to capture events