From c3d2c5e7a2c66e34de94cc4e68fc3f0a2e121192 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Wed, 7 Sep 2005 16:49:21 +0000 Subject: [PATCH] Remove the pointless nsIContent arg of nsIFrame::AttributeChanged. Bug 281390, patch by Vidar Braut Haarr , r+sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@179800 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 4 ++-- mozilla/layout/forms/nsFileControlFrame.cpp | 5 ++--- mozilla/layout/forms/nsFileControlFrame.h | 3 +-- mozilla/layout/forms/nsGfxButtonControlFrame.cpp | 5 ++--- mozilla/layout/forms/nsGfxButtonControlFrame.h | 3 +-- mozilla/layout/forms/nsIsIndexFrame.cpp | 5 ++--- mozilla/layout/forms/nsIsIndexFrame.h | 3 +-- mozilla/layout/forms/nsTextControlFrame.cpp | 5 ++--- mozilla/layout/forms/nsTextControlFrame.h | 3 +-- mozilla/layout/generic/nsAreaFrame.cpp | 5 ++--- mozilla/layout/generic/nsAreaFrame.h | 3 +-- mozilla/layout/generic/nsBlockFrame.cpp | 5 ++--- mozilla/layout/generic/nsBlockFrame.h | 3 +-- mozilla/layout/generic/nsFrame.cpp | 3 +-- mozilla/layout/generic/nsFrame.h | 3 +-- mozilla/layout/generic/nsFrameFrame.cpp | 10 ++++------ mozilla/layout/generic/nsIFrame.h | 4 +--- mozilla/layout/generic/nsImageFrame.cpp | 5 ++--- mozilla/layout/generic/nsImageFrame.h | 3 +-- .../layout/mathml/base/src/nsMathMLContainerFrame.cpp | 3 +-- .../layout/mathml/base/src/nsMathMLContainerFrame.h | 3 +-- mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp | 6 ++---- mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h | 3 +-- .../layout/mathml/base/src/nsMathMLmfencedFrame.cpp | 6 ++---- mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h | 3 +-- mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp | 6 ++---- mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h | 3 +-- mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp | 6 ++---- mozilla/layout/mathml/base/src/nsMathMLmoFrame.h | 3 +-- mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp | 6 ++---- mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h | 3 +-- mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp | 3 +-- mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.h | 3 +-- mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp | 6 ++---- mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h | 3 +-- .../layout/mathml/base/src/nsMathMLmunderoverFrame.cpp | 6 ++---- .../layout/mathml/base/src/nsMathMLmunderoverFrame.h | 3 +-- .../layout/svg/base/src/nsSVGGenericContainerFrame.cpp | 3 +-- .../layout/svg/base/src/nsSVGGenericContainerFrame.h | 3 +-- mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp | 6 ++---- mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp | 6 ++---- mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp | 3 +-- mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h | 3 +-- mozilla/layout/svg/base/src/nsSVGTextFrame.cpp | 6 ++---- mozilla/layout/tables/nsTableCellFrame.cpp | 5 ++--- mozilla/layout/tables/nsTableCellFrame.h | 3 +-- mozilla/layout/xul/base/src/nsBoxFrame.cpp | 7 +++---- mozilla/layout/xul/base/src/nsBoxFrame.h | 3 +-- mozilla/layout/xul/base/src/nsDeckFrame.cpp | 7 +++---- mozilla/layout/xul/base/src/nsDeckFrame.h | 3 +-- mozilla/layout/xul/base/src/nsImageBoxFrame.cpp | 7 +++---- mozilla/layout/xul/base/src/nsImageBoxFrame.h | 3 +-- mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp | 7 +++---- mozilla/layout/xul/base/src/nsLeafBoxFrame.h | 3 +-- mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp | 5 ++--- mozilla/layout/xul/base/src/nsListBoxBodyFrame.h | 3 +-- mozilla/layout/xul/base/src/nsMenuFrame.cpp | 3 +-- mozilla/layout/xul/base/src/nsMenuFrame.h | 3 +-- mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp | 7 +++---- mozilla/layout/xul/base/src/nsMenuPopupFrame.h | 3 +-- mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp | 9 ++++----- mozilla/layout/xul/base/src/nsNativeScrollbarFrame.h | 3 +-- mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp | 9 ++++----- mozilla/layout/xul/base/src/nsProgressMeterFrame.h | 3 +-- mozilla/layout/xul/base/src/nsResizerFrame.cpp | 7 +++---- mozilla/layout/xul/base/src/nsResizerFrame.h | 3 +-- mozilla/layout/xul/base/src/nsScrollbarFrame.cpp | 9 ++++----- mozilla/layout/xul/base/src/nsScrollbarFrame.h | 3 +-- mozilla/layout/xul/base/src/nsSliderFrame.cpp | 7 +++---- mozilla/layout/xul/base/src/nsSliderFrame.h | 3 +-- mozilla/layout/xul/base/src/nsSplitterFrame.cpp | 9 ++++----- mozilla/layout/xul/base/src/nsSplitterFrame.h | 3 +-- mozilla/layout/xul/base/src/nsTextBoxFrame.cpp | 3 +-- mozilla/layout/xul/base/src/nsTextBoxFrame.h | 3 +-- .../layout/xul/base/src/tree/src/nsTreeColFrame.cpp | 7 +++---- mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h | 3 +-- 76 files changed, 127 insertions(+), 214 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 20018f65c22..3d6b80a4074 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -10390,8 +10390,8 @@ nsCSSFrameConstructor::AttributeChanged(nsIContent* aContent, // let the frame deal with it now, so we don't have to deal later if (primaryFrame) { - result = primaryFrame->AttributeChanged(aContent, aNameSpaceID, - aAttribute, aModType); + result = primaryFrame->AttributeChanged(aNameSpaceID, aAttribute, + aModType); // XXXwaterson should probably check for special IB siblings // here, and propagate the AttributeChanged notification to // them, as well. Currently, inline frames don't do anything on diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index fa3dd983a7e..7b0973a2f6c 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -555,8 +555,7 @@ nsFileControlFrame::SyncAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, } NS_IMETHODIMP -nsFileControlFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsFileControlFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -570,7 +569,7 @@ nsFileControlFrame::AttributeChanged(nsIContent* aChild, SyncAttr(aNameSpaceID, aAttribute, SYNC_TEXT); } - return nsAreaFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType); + return nsAreaFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); } PRBool diff --git a/mozilla/layout/forms/nsFileControlFrame.h b/mozilla/layout/forms/nsFileControlFrame.h index 3777476c857..53f728efe63 100644 --- a/mozilla/layout/forms/nsFileControlFrame.h +++ b/mozilla/layout/forms/nsFileControlFrame.h @@ -94,8 +94,7 @@ public: #endif NS_IMETHOD SetSuggestedSize(nscoord aWidth, nscoord aHeight) { return NS_OK; }; NS_IMETHOD GetFrameForPoint(const nsPoint& aPoint, nsFramePaintLayer aWhichLayer, nsIFrame** aFrame); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); virtual PRBool IsLeaf() const; diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp index afe3c41d8af..8060e5d2f88 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp @@ -306,8 +306,7 @@ nsGfxButtonControlFrame::GetDefaultLabel(nsXPIDLString& aString) } NS_IMETHODIMP -nsGfxButtonControlFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsGfxButtonControlFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -327,7 +326,7 @@ nsGfxButtonControlFrame::AttributeChanged(nsIContent* aChild, // defer to HTMLButtonControlFrame } else { - rv = nsHTMLButtonControlFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType); + rv = nsHTMLButtonControlFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); } return rv; } diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.h b/mozilla/layout/forms/nsGfxButtonControlFrame.h index 9c80ba43c61..a1c87866e8d 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.h +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.h @@ -93,8 +93,7 @@ public: nsIContent * aContent, nsIFrame** aFrame); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index f4a42542d41..ce7e3b12766 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -320,8 +320,7 @@ nsIsIndexFrame::IsLeaf() const } NS_IMETHODIMP -nsIsIndexFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsIsIndexFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -329,7 +328,7 @@ nsIsIndexFrame::AttributeChanged(nsIContent* aChild, if (nsHTMLAtoms::prompt == aAttribute) { rv = UpdatePromptLabel(); } else { - rv = nsAreaFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType); + rv = nsAreaFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); } return rv; } diff --git a/mozilla/layout/forms/nsIsIndexFrame.h b/mozilla/layout/forms/nsIsIndexFrame.h index dd91c876e29..4ca40606968 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.h +++ b/mozilla/layout/forms/nsIsIndexFrame.h @@ -110,8 +110,7 @@ public: #ifdef NS_DEBUG NS_IMETHOD GetFrameName(nsAString& aResult) const; #endif - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index 1c8887a2049..e1037f8c887 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -2783,8 +2783,7 @@ nsTextControlFrame::GetSelectionContr(nsISelectionController **aSelCon) ////NSIFRAME NS_IMETHODIMP -nsTextControlFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsTextControlFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -2862,7 +2861,7 @@ nsTextControlFrame::AttributeChanged(nsIContent* aChild, // Allow the base class to handle common attributes supported // by all form elements... else { - rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType); + rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); } return rv; diff --git a/mozilla/layout/forms/nsTextControlFrame.h b/mozilla/layout/forms/nsTextControlFrame.h index 6408a438fd0..e6942e57d57 100644 --- a/mozilla/layout/forms/nsTextControlFrame.h +++ b/mozilla/layout/forms/nsTextControlFrame.h @@ -172,8 +172,7 @@ public: virtual nsIAtom* GetType() const; /** handler for attribute changes to mContent */ - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/generic/nsAreaFrame.cpp b/mozilla/layout/generic/nsAreaFrame.cpp index f99d6d96557..231351ce8c6 100644 --- a/mozilla/layout/generic/nsAreaFrame.cpp +++ b/mozilla/layout/generic/nsAreaFrame.cpp @@ -155,12 +155,11 @@ nsAreaFrame::Destroy(nsPresContext* aPresContext) } NS_IMETHODIMP -nsAreaFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsAreaFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBlockFrame::AttributeChanged(aChild, aNameSpaceID, + nsresult rv = nsBlockFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); // If the accesskey changed, register for the new value diff --git a/mozilla/layout/generic/nsAreaFrame.h b/mozilla/layout/generic/nsAreaFrame.h index 5dfac4dcbce..9590f89aed3 100644 --- a/mozilla/layout/generic/nsAreaFrame.h +++ b/mozilla/layout/generic/nsAreaFrame.h @@ -67,8 +67,7 @@ public: NS_IMETHOD Destroy(nsPresContext* aPresContext); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); #endif diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index a1e35639382..29f21844c76 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -2979,12 +2979,11 @@ nsBlockFrame::SlideLine(nsBlockReflowState& aState, } NS_IMETHODIMP -nsBlockFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsBlockFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBlockFrameSuper::AttributeChanged(aChild, aNameSpaceID, + nsresult rv = nsBlockFrameSuper::AttributeChanged(aNameSpaceID, aAttribute, aModType); if (NS_FAILED(rv)) { diff --git a/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h index c83d3b75863..ada37810bbf 100644 --- a/mozilla/layout/generic/nsBlockFrame.h +++ b/mozilla/layout/generic/nsBlockFrame.h @@ -225,8 +225,7 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 2aac7abddea..0b7cd049836 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -2178,8 +2178,7 @@ nsFrame::CharacterDataChanged(nsPresContext* aPresContext, } NS_IMETHODIMP -nsFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index 071d79b2313..16bb3d552b5 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -223,8 +223,7 @@ public: NS_IMETHOD CharacterDataChanged(nsPresContext* aPresContext, nsIContent* aChild, PRBool aAppend); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const; diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index ebe0e5a2c35..59a61a782cb 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -126,8 +126,7 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); @@ -447,12 +446,11 @@ nsSubDocumentFrame::VerifyTree() const } NS_IMETHODIMP -nsSubDocumentFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsSubDocumentFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsIAtom *type = aChild->Tag(); + nsIAtom *type = mContent->Tag(); if ((type != nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::src) || (type == nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::data)) { @@ -481,7 +479,7 @@ nsSubDocumentFrame::AttributeChanged(nsIContent* aChild, return NS_OK; nsAutoString value; - aChild->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, value); + mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, value); // Notify our enclosing chrome that the primary content shell // has changed. diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 348434239fa..5a2d7c82b18 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -844,14 +844,12 @@ public: * The first frame that maps that content is asked to deal * with the change by doing whatever is appropriate. * - * @param aChild the piece of content whose attribute changed * @param aNameSpaceID the namespace of the attribute * @param aAttribute the atom name of the attribute * @param aModType Whether or not the attribute was added, changed, or removed. * The constants are defined in nsIDOMMutationEvent.h. */ - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) = 0; diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 4519def34ff..5df9975d442 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -1754,12 +1754,11 @@ nsImageFrame::GetCursor(const nsPoint& aPoint, } NS_IMETHODIMP -nsImageFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsImageFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsSplittableFrame::AttributeChanged(aChild, aNameSpaceID, + nsresult rv = nsSplittableFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); if (NS_FAILED(rv)) { return rv; diff --git a/mozilla/layout/generic/nsImageFrame.h b/mozilla/layout/generic/nsImageFrame.h index 671ecc94f0a..7d773e936c0 100644 --- a/mozilla/layout/generic/nsImageFrame.h +++ b/mozilla/layout/generic/nsImageFrame.h @@ -115,8 +115,7 @@ public: nsEventStatus* aEventStatus); NS_IMETHOD GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp index c689ade4714..82bf020b19f 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp @@ -999,8 +999,7 @@ nsMathMLContainerFrame::ReplaceFrame(nsIAtom* aListName, } NS_IMETHODIMP -nsMathMLContainerFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsMathMLContainerFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h index 0c02abfdb22..746feb0acca 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h @@ -192,8 +192,7 @@ public: // Therefore, there is an overhead here in that our siblings are re-laid // too (e.g., this happens with , , , ). NS_IMETHOD - AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp index 8f495431907..fb6f6d75974 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp @@ -280,8 +280,7 @@ nsMathMLTokenFrame::ReflowDirtyChild(nsIPresShell* aPresShell, } NS_IMETHODIMP -nsMathMLTokenFrame::AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, +nsMathMLTokenFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -291,8 +290,7 @@ nsMathMLTokenFrame::AttributeChanged(nsIContent* aContent, } return nsMathMLContainerFrame:: - AttributeChanged(aContent, aNameSpaceID, - aAttribute, aModType); + AttributeChanged(aNameSpaceID, aAttribute, aModType); } void diff --git a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h index fe37cfda289..8bb8b7ec50d 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h @@ -79,8 +79,7 @@ public: nsIFrame* aChild); NS_IMETHOD - AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); protected: diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp index eece6f3601a..597d206b62b 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp @@ -104,8 +104,7 @@ nsMathMLmfencedFrame::SetInitialChildList(nsPresContext* aPresContext, } NS_IMETHODIMP -nsMathMLmfencedFrame::AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, +nsMathMLmfencedFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -113,8 +112,7 @@ nsMathMLmfencedFrame::AttributeChanged(nsIContent* aContent, CreateFencesAndSeparators(GetPresContext()); return nsMathMLContainerFrame:: - AttributeChanged(aContent, aNameSpaceID, - aAttribute, aModType); + AttributeChanged(aNameSpaceID, aAttribute, aModType); } nsresult diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h index fc0e651299a..db5472371c4 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.h @@ -78,8 +78,7 @@ public: PRUint32 aFlags = 0); NS_IMETHOD - AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp index 098b626fbad..9669409d29a 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp @@ -459,8 +459,7 @@ nsMathMLmfracFrame::Place(nsIRenderingContext& aRenderingContext, } NS_IMETHODIMP -nsMathMLmfracFrame::AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, +nsMathMLmfracFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -486,8 +485,7 @@ nsMathMLmfracFrame::AttributeChanged(nsIContent* aContent, } } return nsMathMLContainerFrame:: - AttributeChanged(aContent, aNameSpaceID, - aAttribute, aModType); + AttributeChanged(aNameSpaceID, aAttribute, aModType); } NS_IMETHODIMP diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h index 74e49921dc0..f1e544d526d 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h @@ -96,8 +96,7 @@ public: virtual nsIAtom* GetType() const; NS_IMETHOD - AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp index ff5c2675e28..df45136a13c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp @@ -1002,8 +1002,7 @@ nsMathMLmoFrame::ReflowDirtyChild(nsIPresShell* aPresShell, } NS_IMETHODIMP -nsMathMLmoFrame::AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, +nsMathMLmoFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -1026,8 +1025,7 @@ nsMathMLmoFrame::AttributeChanged(nsIContent* aContent, } return nsMathMLTokenFrame:: - AttributeChanged(aContent, aNameSpaceID, - aAttribute, aModType); + AttributeChanged(aNameSpaceID, aAttribute, aModType); } // ---------------------- diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h index b759dff76b9..af15716bed4 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h @@ -83,8 +83,7 @@ public: nsIFrame* aChild); NS_IMETHOD - AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp index eda8102fed8..55c29ce8e91 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp @@ -80,8 +80,7 @@ nsMathMLmoverFrame::~nsMathMLmoverFrame() } NS_IMETHODIMP -nsMathMLmoverFrame::AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, +nsMathMLmoverFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -92,8 +91,7 @@ nsMathMLmoverFrame::AttributeChanged(nsIContent* aContent, } return nsMathMLContainerFrame:: - AttributeChanged(aContent, aNameSpaceID, - aAttribute, aModType); + AttributeChanged(aNameSpaceID, aAttribute, aModType); } NS_IMETHODIMP diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h index 3ac9e29a9d6..3bbd5878cdb 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.h @@ -75,8 +75,7 @@ public: PRUint32 aFlagsToUpdate); NS_IMETHOD - AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp index a501f69bda1..925234008f3 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp @@ -203,8 +203,7 @@ nsMathMLmstyleFrame::UpdatePresentationDataFromChildAt(PRInt32 aFirstInd } NS_IMETHODIMP -nsMathMLmstyleFrame::AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, +nsMathMLmstyleFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.h index 58498fe5794..3dd37891b1c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.h @@ -51,8 +51,7 @@ public: friend nsresult NS_NewMathMLmstyleFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); NS_IMETHOD - AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp index ce88915a65d..125b767857b 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.cpp @@ -80,8 +80,7 @@ nsMathMLmunderFrame::~nsMathMLmunderFrame() } NS_IMETHODIMP -nsMathMLmunderFrame::AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, +nsMathMLmunderFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -92,8 +91,7 @@ nsMathMLmunderFrame::AttributeChanged(nsIContent* aContent, } return nsMathMLContainerFrame:: - AttributeChanged(aContent, aNameSpaceID, - aAttribute, aModType); + AttributeChanged(aNameSpaceID, aAttribute, aModType); } NS_IMETHODIMP diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h index 4545c16adf4..80ae7172298 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderFrame.h @@ -75,8 +75,7 @@ public: PRUint32 aFlagsToUpdate); NS_IMETHOD - AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp index 58ead69d49b..5f5cf1191dd 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.cpp @@ -80,8 +80,7 @@ nsMathMLmunderoverFrame::~nsMathMLmunderoverFrame() } NS_IMETHODIMP -nsMathMLmunderoverFrame::AttributeChanged(nsIContent* aContent, - PRInt32 aNameSpaceID, +nsMathMLmunderoverFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -93,8 +92,7 @@ nsMathMLmunderoverFrame::AttributeChanged(nsIContent* aContent, } return nsMathMLContainerFrame:: - AttributeChanged(aContent, aNameSpaceID, - aAttribute, aModType); + AttributeChanged(aNameSpaceID, aAttribute, aModType); } NS_IMETHODIMP diff --git a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h index fd4f33e501b..146cbce2528 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmunderoverFrame.h @@ -75,8 +75,7 @@ public: PRUint32 aFlagsToUpdate); NS_IMETHOD - AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.cpp b/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.cpp index fa524efba06..641b6859a68 100644 --- a/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.cpp @@ -171,8 +171,7 @@ nsSVGGenericContainerFrame::ReplaceFrame(nsIAtom* aListName, } NS_IMETHODIMP -nsSVGGenericContainerFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsSVGGenericContainerFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.h b/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.h index 31758bad250..7bdc522b99e 100644 --- a/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.h @@ -85,8 +85,7 @@ public: nsStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); /** diff --git a/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp b/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp index 90757b85096..646c604865f 100644 --- a/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp @@ -98,8 +98,7 @@ public: nsStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); /** @@ -346,8 +345,7 @@ nsSVGInnerSVGFrame::ReplaceFrame(nsIAtom* aListName, } NS_IMETHODIMP -nsSVGInnerSVGFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsSVGInnerSVGFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp index 2c5e403d89b..30d47720656 100644 --- a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp @@ -199,8 +199,7 @@ public: nsIFrame* aOldFrame, nsIFrame* aNewFrame); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); @@ -686,8 +685,7 @@ nsSVGOuterSVGFrame::ReplaceFrame(nsIAtom* aListName, } NS_IMETHODIMP -nsSVGOuterSVGFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsSVGOuterSVGFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp index 62f985eabb6..b60db3b5f1a 100644 --- a/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp @@ -134,8 +134,7 @@ nsSVGPathGeometryFrame::Init(nsPresContext* aPresContext, } NS_IMETHODIMP -nsSVGPathGeometryFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsSVGPathGeometryFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h b/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h index 819d84a2dcc..c484ee49f6a 100644 --- a/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.h @@ -82,8 +82,7 @@ public: nsStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp b/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp index 428dfdb0c97..4076ec531f5 100644 --- a/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp @@ -112,8 +112,7 @@ public: nsStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); @@ -346,8 +345,7 @@ nsSVGTextFrame::Init(nsPresContext* aPresContext, } NS_IMETHODIMP -nsSVGTextFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsSVGTextFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index 9818cfabf79..dd7026bd70d 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -204,8 +204,7 @@ nsTableCellFrame::GetColIndex(PRInt32 &aColIndex) const } NS_IMETHODIMP -nsTableCellFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsTableCellFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -213,7 +212,7 @@ nsTableCellFrame::AttributeChanged(nsIContent* aChild, nsTableFrame* tableFrame = nsnull; nsresult rv = nsTableFrame::GetTableFrame(this, tableFrame); if ((NS_SUCCEEDED(rv)) && (tableFrame)) { - tableFrame->AttributeChangedFor(this, aChild, aAttribute); + tableFrame->AttributeChangedFor(this, mContent, aAttribute); } return NS_OK; } diff --git a/mozilla/layout/tables/nsTableCellFrame.h b/mozilla/layout/tables/nsTableCellFrame.h index 34573b91399..ef48221030f 100644 --- a/mozilla/layout/tables/nsTableCellFrame.h +++ b/mozilla/layout/tables/nsTableCellFrame.h @@ -92,8 +92,7 @@ public: #endif - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index ae98c99db53..15394d6143b 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -1237,13 +1237,12 @@ nsBoxFrame::AppendFrames(nsIAtom* aListName, NS_IMETHODIMP -nsBoxFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsBoxFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsContainerFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsContainerFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); // Ignore 'width', 'height', 'screenX', 'screenY' and 'sizemode' on a // . diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.h b/mozilla/layout/xul/base/src/nsBoxFrame.h index 388547a101d..c495b7be28a 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsBoxFrame.h @@ -140,8 +140,7 @@ public: nsIFrame* asPrevInFlow); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsDeckFrame.cpp b/mozilla/layout/xul/base/src/nsDeckFrame.cpp index faac6356adf..07d5f67ac78 100644 --- a/mozilla/layout/xul/base/src/nsDeckFrame.cpp +++ b/mozilla/layout/xul/base/src/nsDeckFrame.cpp @@ -100,13 +100,12 @@ nsDeckFrame::ChildrenMustHaveWidgets(PRBool& aMust) const } NS_IMETHODIMP -nsDeckFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsDeckFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); // if the index changed hide the old element and make the now element visible diff --git a/mozilla/layout/xul/base/src/nsDeckFrame.h b/mozilla/layout/xul/base/src/nsDeckFrame.h index aa21b124956..964547d57c6 100644 --- a/mozilla/layout/xul/base/src/nsDeckFrame.h +++ b/mozilla/layout/xul/base/src/nsDeckFrame.h @@ -56,8 +56,7 @@ public: nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp index 9462a7f3649..effa6ff0484 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp @@ -245,13 +245,12 @@ NS_NewImageBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ) } // NS_NewTitledButtonFrame NS_IMETHODIMP -nsImageBoxFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsImageBoxFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsLeafBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsLeafBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); if (aAttribute == nsHTMLAtoms::src) { UpdateImage(); diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.h b/mozilla/layout/xul/base/src/nsImageBoxFrame.h index 5405c9910f3..103b358f15e 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.h @@ -82,8 +82,7 @@ public: nsStyleContext* aContext, nsIFrame* asPrevInFlow); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp b/mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp index f301ecf0be9..6cc584a11d7 100644 --- a/mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsLeafBoxFrame.cpp @@ -131,13 +131,12 @@ nsLeafBoxFrame::Init(nsPresContext* aPresContext, } NS_IMETHODIMP -nsLeafBoxFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsLeafBoxFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsLeafFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsLeafFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); if (aAttribute == nsXULAtoms::mousethrough) UpdateMouseThrough(); diff --git a/mozilla/layout/xul/base/src/nsLeafBoxFrame.h b/mozilla/layout/xul/base/src/nsLeafBoxFrame.h index 871bb494d9a..453c8a483ea 100644 --- a/mozilla/layout/xul/base/src/nsLeafBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsLeafBoxFrame.h @@ -86,8 +86,7 @@ public: nsFramePaintLayer aWhichLayer, nsIFrame** aFrame); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp index 2cf06bc0277..b07798012d4 100644 --- a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp @@ -298,8 +298,7 @@ nsListBoxBodyFrame::Destroy(nsPresContext* aPresContext) } NS_IMETHODIMP -nsListBoxBodyFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsListBoxBodyFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { @@ -326,7 +325,7 @@ nsListBoxBodyFrame::AttributeChanged(nsIContent* aChild, } } else - rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType); + rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); return rv; diff --git a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.h b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.h index 5efa44d2f14..eda80c1f22e 100644 --- a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.h +++ b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.h @@ -77,8 +77,7 @@ public: NS_IMETHOD Init(nsPresContext* aPresContext, nsIContent* aContent, nsIFrame* aParent, nsStyleContext* aContext, nsIFrame* aPrevInFlow); NS_IMETHOD Destroy(nsPresContext* aPresContext); - NS_IMETHOD AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID, - nsIAtom* aAttribute, PRInt32 aModType); + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); // nsIScrollbarMediator NS_IMETHOD PositionChanged(nsISupports* aScrollbar, PRInt32 aOldIndex, PRInt32& aNewIndex); diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index dc801efc8d4..42b1289197f 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -696,8 +696,7 @@ nsMenuFrame::ActivateMenu(PRBool aActivateFlag) } NS_IMETHODIMP -nsMenuFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsMenuFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.h b/mozilla/layout/xul/base/src/nsMenuFrame.h index 2bceabeb5dd..784a3d94552 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.h +++ b/mozilla/layout/xul/base/src/nsMenuFrame.h @@ -211,8 +211,7 @@ protected: // Called as a hook just after the menu goes away. PRBool OnDestroyed(); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); virtual ~nsMenuFrame(); diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp index 98e0331e06c..4ce0b3233fb 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -1927,14 +1927,13 @@ nsMenuPopupFrame::IsDisabled(nsIContent* aContent) } NS_IMETHODIMP -nsMenuPopupFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsMenuPopupFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); if (aAttribute == nsXULAtoms::left || aAttribute == nsXULAtoms::top) MoveToAttributePosition(); diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.h b/mozilla/layout/xul/base/src/nsMenuPopupFrame.h index 232a39dc61d..be792272d19 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.h +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.h @@ -123,8 +123,7 @@ public: nsStyleContext* aContext, nsIFrame* aPrevInFlow); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp b/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp index 7c3ddbacee8..1e19d98b3f2 100644 --- a/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp @@ -198,20 +198,19 @@ nsNativeScrollbarFrame::Reflow(nsPresContext* aPresContext, // our native scrollbar with the correct values. // NS_IMETHODIMP -nsNativeScrollbarFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsNativeScrollbarFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); if ( aAttribute == nsXULAtoms::curpos || aAttribute == nsXULAtoms::maxpos || aAttribute == nsXULAtoms::pageincrement || aAttribute == nsXULAtoms::increment ) { nsAutoString valueStr; - aChild->GetAttr(aNameSpaceID, aAttribute, valueStr); + mContent->GetAttr(aNameSpaceID, aAttribute, valueStr); PRInt32 error; PRInt32 value = valueStr.ToInteger(&error); diff --git a/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.h b/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.h index 4c8e450fbb5..e8f791456f7 100644 --- a/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.h +++ b/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.h @@ -75,8 +75,7 @@ public: nsIFrame* aParent, nsStyleContext* aContext, nsIFrame* aPrevInFlow); // nsIFrame overrides - NS_IMETHOD AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID, - nsIAtom* aAttribute, PRInt32 aModType); + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; } diff --git a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp index a5566c6f12b..87ee03cf2d9 100644 --- a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp @@ -98,18 +98,17 @@ nsProgressMeterFrame::SetInitialChildList(nsPresContext* aPresContext, { // Set up our initial flexes. nsresult rv = nsBoxFrame::SetInitialChildList(aPresContext, aListName, aChildList); - AttributeChanged(mContent, kNameSpaceID_None, nsHTMLAtoms::value, 0); + AttributeChanged(kNameSpaceID_None, nsHTMLAtoms::value, 0); return rv; } NS_IMETHODIMP -nsProgressMeterFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsProgressMeterFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); if (NS_OK != rv) { return rv; } diff --git a/mozilla/layout/xul/base/src/nsProgressMeterFrame.h b/mozilla/layout/xul/base/src/nsProgressMeterFrame.h index 0ae9b36df90..abe48499e9d 100644 --- a/mozilla/layout/xul/base/src/nsProgressMeterFrame.h +++ b/mozilla/layout/xul/base/src/nsProgressMeterFrame.h @@ -62,8 +62,7 @@ public: nsIAtom* aListName, nsIFrame* aChildList); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsResizerFrame.cpp b/mozilla/layout/xul/base/src/nsResizerFrame.cpp index 2704e04dca0..5c1b27c888f 100644 --- a/mozilla/layout/xul/base/src/nsResizerFrame.cpp +++ b/mozilla/layout/xul/base/src/nsResizerFrame.cpp @@ -329,13 +329,12 @@ nsResizerFrame::GetInitialDirection(eDirection& aDirection) NS_IMETHODIMP -nsResizerFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsResizerFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsTitleBarFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsTitleBarFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); if (aAttribute == nsXULAtoms::dir ) { diff --git a/mozilla/layout/xul/base/src/nsResizerFrame.h b/mozilla/layout/xul/base/src/nsResizerFrame.h index 0e2c30f212b..636672ea7ce 100644 --- a/mozilla/layout/xul/base/src/nsResizerFrame.h +++ b/mozilla/layout/xul/base/src/nsResizerFrame.h @@ -72,8 +72,7 @@ public: nsStyleContext* aContext, nsIFrame* asPrevInFlow); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp b/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp index 7e4ca230c4a..49dfc47355e 100644 --- a/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp @@ -130,13 +130,12 @@ nsScrollbarFrame::IsContainingBlock() const } NS_IMETHODIMP -nsScrollbarFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsScrollbarFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); // if the current position changes, notify any nsGfxScrollFrame // parent we may have @@ -152,7 +151,7 @@ nsScrollbarFrame::AttributeChanged(nsIContent* aChild, if (!scrollable) return rv; - scrollable->CurPosAttributeChanged(aChild, aModType); + scrollable->CurPosAttributeChanged(mContent, aModType); return rv; } diff --git a/mozilla/layout/xul/base/src/nsScrollbarFrame.h b/mozilla/layout/xul/base/src/nsScrollbarFrame.h index 9f472284f7d..de019a24543 100644 --- a/mozilla/layout/xul/base/src/nsScrollbarFrame.h +++ b/mozilla/layout/xul/base/src/nsScrollbarFrame.h @@ -63,8 +63,7 @@ public: #endif // nsIFrame overrides - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp index 782e89cf2c7..0894e22655d 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -224,13 +224,12 @@ nsSliderFrame::GetIntegerAttribute(nsIContent* content, nsIAtom* atom, PRInt32 d NS_IMETHODIMP -nsSliderFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsSliderFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); // if the current position changes if (aAttribute == nsXULAtoms::curpos) { rv = CurrentPositionChanged(GetPresContext()); diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.h b/mozilla/layout/xul/base/src/nsSliderFrame.h index 81ad61b2145..cbdeff803eb 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.h +++ b/mozilla/layout/xul/base/src/nsSliderFrame.h @@ -159,8 +159,7 @@ public: nsFramePaintLayer aWhichLayer, PRUint32 aFlags = 0); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index ab45636b300..1065334aec2 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -283,13 +283,12 @@ nsSplitterFrame::GetCursor(const nsPoint& aPoint, } NS_IMETHODIMP -nsSplitterFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsSplitterFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); // if the alignment changed. Let the grippy know if (aAttribute == nsHTMLAtoms::align) { // tell the slider its attribute changed so it can @@ -297,7 +296,7 @@ nsSplitterFrame::AttributeChanged(nsIContent* aChild, nsIFrame* grippy = nsnull; nsScrollbarButtonFrame::GetChildWithTag(GetPresContext(), nsXULAtoms::grippy, this, grippy); if (grippy) - grippy->AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType); + grippy->AttributeChanged(aNameSpaceID, aAttribute, aModType); } else if (aAttribute == nsXULAtoms::state) { mInner->UpdateState(); } diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.h b/mozilla/layout/xul/base/src/nsSplitterFrame.h index b83433a698d..9d0fbdd1f8d 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.h +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.h @@ -63,8 +63,7 @@ public: #endif // nsIFrame overrides - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp index 13df2d87f6a..b2947392d8c 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp @@ -122,8 +122,7 @@ NS_NewTextBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ) NS_IMETHODIMP -nsTextBoxFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsTextBoxFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.h b/mozilla/layout/xul/base/src/nsTextBoxFrame.h index fbd5e46e445..58448849cc5 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.h @@ -66,8 +66,7 @@ public: NS_IMETHOD Destroy(nsPresContext* aPresContext); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType); diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp index d3ce8bd25a0..140cab1dc0d 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp @@ -180,13 +180,12 @@ nsTreeColFrame::GetFrameForPoint(const nsPoint& aPoint, } NS_IMETHODIMP -nsTreeColFrame::AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, +nsTreeColFrame::AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType) { - nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, - aAttribute, aModType); + nsresult rv = nsBoxFrame::AttributeChanged(aNameSpaceID, aAttribute, + aModType); if (aAttribute == nsXULAtoms::ordinal || aAttribute == nsXULAtoms::primary) { EnsureColumns(); diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h index 3ebd6c5c787..0bd00ed5cf8 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h @@ -62,8 +62,7 @@ public: nsFramePaintLayer aWhichLayer, nsIFrame** aFrame); - NS_IMETHOD AttributeChanged(nsIContent* aChild, - PRInt32 aNameSpaceID, + NS_IMETHOD AttributeChanged(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType);