From 4f51638ef448e7aa9e9f87ffaada766d18015688 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Sat, 25 Aug 2001 02:01:08 +0000 Subject: [PATCH] Fix for 95475. r=jag, sr=ben, a=dbaron git-svn-id: svn://10.0.0.236/trunk@101788 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/public/nsIDocument.h | 1 + .../content/base/public/nsIDocumentObserver.h | 4 ++++ .../content/base/public/nsIStyledContent.h | 3 +-- mozilla/content/base/src/nsContentList.h | 1 + mozilla/content/base/src/nsDocument.cpp | 3 ++- mozilla/content/base/src/nsDocument.h | 2 ++ mozilla/content/base/src/nsGenericElement.cpp | 7 +++--- mozilla/content/base/src/nsGenericElement.h | 2 +- mozilla/content/base/src/nsStyleSet.cpp | 4 +++- .../html/content/src/nsGenericHTMLElement.cpp | 16 ++++++++----- .../html/content/src/nsGenericHTMLElement.h | 2 +- .../html/content/src/nsHTMLAppletElement.cpp | 4 ++-- .../html/content/src/nsHTMLBRElement.cpp | 4 ++-- .../content/src/nsHTMLBaseFontElement.cpp | 4 ++-- .../html/content/src/nsHTMLBodyElement.cpp | 4 ++-- .../html/content/src/nsHTMLDListElement.cpp | 4 ++-- .../content/src/nsHTMLDirectoryElement.cpp | 4 ++-- .../html/content/src/nsHTMLDivElement.cpp | 4 ++-- .../html/content/src/nsHTMLEmbedElement.cpp | 4 ++-- .../html/content/src/nsHTMLFontElement.cpp | 4 ++-- .../content/src/nsHTMLFrameSetElement.cpp | 4 ++-- .../html/content/src/nsHTMLHRElement.cpp | 4 ++-- .../html/content/src/nsHTMLHeadingElement.cpp | 4 ++-- .../html/content/src/nsHTMLIFrameElement.cpp | 4 ++-- .../html/content/src/nsHTMLImageElement.cpp | 4 ++-- .../html/content/src/nsHTMLInputElement.cpp | 4 ++-- .../html/content/src/nsHTMLLIElement.cpp | 4 ++-- .../html/content/src/nsHTMLMapElement.cpp | 4 ++-- .../html/content/src/nsHTMLMenuElement.cpp | 4 ++-- .../html/content/src/nsHTMLOListElement.cpp | 4 ++-- .../html/content/src/nsHTMLObjectElement.cpp | 4 ++-- .../html/content/src/nsHTMLOptionElement.cpp | 4 ++-- .../content/src/nsHTMLParagraphElement.cpp | 4 ++-- .../html/content/src/nsHTMLPreElement.cpp | 4 ++-- .../html/content/src/nsHTMLSelectElement.cpp | 4 ++-- .../content/src/nsHTMLSharedObjectElement.cpp | 4 ++-- .../html/content/src/nsHTMLSpacerElement.cpp | 4 ++-- .../content/src/nsHTMLTableCaptionElement.cpp | 4 ++-- .../content/src/nsHTMLTableCellElement.cpp | 4 ++-- .../content/src/nsHTMLTableColElement.cpp | 4 ++-- .../src/nsHTMLTableColGroupElement.cpp | 4 ++-- .../html/content/src/nsHTMLTableElement.cpp | 4 ++-- .../content/src/nsHTMLTableRowElement.cpp | 4 ++-- .../content/src/nsHTMLTableSectionElement.cpp | 4 ++-- .../content/src/nsHTMLTextAreaElement.cpp | 4 ++-- .../html/content/src/nsHTMLUListElement.cpp | 4 ++-- .../html/content/src/nsHTMLUnknownElement.cpp | 6 ++--- .../html/document/src/nsHTMLContentSink.cpp | 1 + .../html/document/src/nsHTMLDocument.cpp | 4 ++-- .../html/document/src/nsHTMLDocument.h | 1 + mozilla/content/xbl/src/nsBindingManager.cpp | 1 + .../content/xul/content/src/nsXULElement.cpp | 24 +++++++++++++++---- .../content/xul/content/src/nsXULElement.h | 2 +- .../xul/document/src/nsXULDocument.cpp | 3 ++- .../content/xul/document/src/nsXULDocument.h | 1 + .../xul/templates/src/nsXULContentBuilder.cpp | 4 +++- .../templates/src/nsXULTemplateBuilder.cpp | 1 + .../xul/templates/src/nsXULTemplateBuilder.h | 1 + mozilla/layout/base/nsCSSFrameConstructor.cpp | 9 +++---- mozilla/layout/base/nsCSSFrameConstructor.h | 1 + mozilla/layout/base/nsPresShell.cpp | 4 +++- mozilla/layout/base/public/nsIFrame.h | 1 + .../base/public/nsIStyleFrameConstruction.h | 1 + mozilla/layout/base/public/nsIStyleSet.h | 1 + mozilla/layout/forms/nsFileControlFrame.cpp | 3 ++- mozilla/layout/forms/nsFileControlFrame.h | 1 + .../layout/forms/nsGfxButtonControlFrame.cpp | 3 ++- .../layout/forms/nsGfxButtonControlFrame.h | 1 + .../forms/nsGfxCheckboxControlFrame.cpp | 3 ++- .../layout/forms/nsGfxCheckboxControlFrame.h | 1 + mozilla/layout/forms/nsIsIndexFrame.cpp | 3 ++- mozilla/layout/forms/nsIsIndexFrame.h | 1 + mozilla/layout/generic/nsBlockFrame.cpp | 3 ++- mozilla/layout/generic/nsBlockFrame.h | 1 + mozilla/layout/generic/nsFrame.cpp | 1 + mozilla/layout/generic/nsFrame.h | 1 + mozilla/layout/generic/nsFrameFrame.cpp | 2 ++ mozilla/layout/generic/nsGfxScrollFrame.cpp | 2 ++ mozilla/layout/generic/nsHTMLFrame.cpp | 2 ++ mozilla/layout/generic/nsIFrame.h | 1 + mozilla/layout/generic/nsImageFrame.cpp | 3 ++- mozilla/layout/generic/nsImageFrame.h | 1 + mozilla/layout/generic/nsImageMap.cpp | 1 + mozilla/layout/generic/nsImageMap.h | 1 + mozilla/layout/html/base/src/nsBlockFrame.cpp | 3 ++- mozilla/layout/html/base/src/nsBlockFrame.h | 1 + mozilla/layout/html/base/src/nsFrame.cpp | 1 + mozilla/layout/html/base/src/nsFrame.h | 1 + .../layout/html/base/src/nsGfxScrollFrame.cpp | 2 ++ mozilla/layout/html/base/src/nsHTMLFrame.cpp | 2 ++ mozilla/layout/html/base/src/nsImageFrame.cpp | 3 ++- mozilla/layout/html/base/src/nsImageFrame.h | 1 + mozilla/layout/html/base/src/nsImageMap.cpp | 1 + mozilla/layout/html/base/src/nsImageMap.h | 1 + mozilla/layout/html/base/src/nsPresShell.cpp | 4 +++- .../layout/html/document/src/nsFrameFrame.cpp | 2 ++ .../html/forms/src/nsFileControlFrame.cpp | 3 ++- .../html/forms/src/nsFileControlFrame.h | 1 + .../forms/src/nsGfxButtonControlFrame.cpp | 3 ++- .../html/forms/src/nsGfxButtonControlFrame.h | 1 + .../forms/src/nsGfxCheckboxControlFrame.cpp | 3 ++- .../forms/src/nsGfxCheckboxControlFrame.h | 1 + .../html/forms/src/nsGfxTextControlFrame2.cpp | 3 ++- .../html/forms/src/nsGfxTextControlFrame2.h | 1 + .../layout/html/forms/src/nsIsIndexFrame.cpp | 3 ++- .../layout/html/forms/src/nsIsIndexFrame.h | 1 + .../html/style/src/nsCSSFrameConstructor.cpp | 9 +++---- .../html/style/src/nsCSSFrameConstructor.h | 1 + .../html/table/src/nsTableCellFrame.cpp | 1 + .../layout/html/table/src/nsTableCellFrame.h | 1 + .../base/src/nsMathMLContainerFrame.cpp | 3 ++- .../mathml/base/src/nsMathMLContainerFrame.h | 1 + mozilla/layout/style/nsStyleSet.cpp | 4 +++- .../layout/svg/base/src/nsPolygonFrame.cpp | 3 ++- mozilla/layout/svg/base/src/nsPolygonFrame.h | 1 + .../svg/base/src/nsSVGContainerFrame.cpp | 3 ++- .../layout/svg/base/src/nsSVGContainerFrame.h | 1 + .../layout/svg/base/src/nsSVGPathFrame.cpp | 3 ++- mozilla/layout/svg/base/src/nsSVGPathFrame.h | 1 + mozilla/layout/tables/nsTableCellFrame.cpp | 1 + mozilla/layout/tables/nsTableCellFrame.h | 1 + mozilla/layout/xul/base/src/nsBoxFrame.cpp | 3 ++- mozilla/layout/xul/base/src/nsBoxFrame.h | 1 + mozilla/layout/xul/base/src/nsDeckFrame.cpp | 3 ++- mozilla/layout/xul/base/src/nsDeckFrame.h | 1 + .../layout/xul/base/src/nsImageBoxFrame.cpp | 1 + mozilla/layout/xul/base/src/nsImageBoxFrame.h | 1 + mozilla/layout/xul/base/src/nsMenuFrame.cpp | 1 + mozilla/layout/xul/base/src/nsMenuFrame.h | 1 + .../xul/base/src/nsProgressMeterFrame.cpp | 5 ++-- .../xul/base/src/nsProgressMeterFrame.h | 1 + .../layout/xul/base/src/nsResizerFrame.cpp | 3 ++- mozilla/layout/xul/base/src/nsResizerFrame.h | 1 + .../layout/xul/base/src/nsScrollbarFrame.cpp | 5 ++-- .../layout/xul/base/src/nsScrollbarFrame.h | 1 + mozilla/layout/xul/base/src/nsSliderFrame.cpp | 3 ++- mozilla/layout/xul/base/src/nsSliderFrame.h | 1 + .../layout/xul/base/src/nsSplitterFrame.cpp | 5 ++-- mozilla/layout/xul/base/src/nsSplitterFrame.h | 1 + .../layout/xul/base/src/nsTextBoxFrame.cpp | 1 + mozilla/layout/xul/base/src/nsTextBoxFrame.h | 1 + .../layout/xul/base/src/nsXULTreeFrame.cpp | 4 ++-- mozilla/layout/xul/base/src/nsXULTreeFrame.h | 2 +- .../xul/base/src/nsXULTreeGroupFrame.cpp | 7 +++--- .../layout/xul/base/src/nsXULTreeGroupFrame.h | 2 +- .../xul/base/src/nsXULTreeOuterGroupFrame.cpp | 5 ++-- .../xul/base/src/nsXULTreeOuterGroupFrame.h | 2 +- .../src/outliner/src/nsOutlinerColFrame.cpp | 3 ++- .../src/outliner/src/nsOutlinerColFrame.h | 1 + .../xul/base/src/tree/src/nsTreeColFrame.cpp | 3 ++- .../xul/base/src/tree/src/nsTreeColFrame.h | 1 + .../xpfe/appshell/src/nsWebShellWindow.cpp | 1 + mozilla/xpfe/appshell/src/nsWebShellWindow.h | 1 + 153 files changed, 286 insertions(+), 148 deletions(-) diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h index 66e39182fea..4a2fbc1cb9f 100644 --- a/mozilla/content/base/public/nsIDocument.h +++ b/mozilla/content/base/public/nsIDocument.h @@ -306,6 +306,7 @@ public: NS_IMETHOD AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) = 0; // See nsStyleConsts fot hint values NS_IMETHOD ContentAppended(nsIContent* aContainer, PRInt32 aNewIndexInContainer) = 0; diff --git a/mozilla/content/base/public/nsIDocumentObserver.h b/mozilla/content/base/public/nsIDocumentObserver.h index 73bb8a3f47e..464dd98d1cc 100644 --- a/mozilla/content/base/public/nsIDocumentObserver.h +++ b/mozilla/content/base/public/nsIDocumentObserver.h @@ -133,11 +133,15 @@ public: * @param aDocument The document being observed * @param aContent the piece of content whose attribute changed * @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. + * @param aHint The style hint. */ NS_IMETHOD AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) = 0; // See nsStyleConsts fot hint values /** diff --git a/mozilla/content/base/public/nsIStyledContent.h b/mozilla/content/base/public/nsIStyledContent.h index 317797cd3c5..9b87340260d 100644 --- a/mozilla/content/base/public/nsIStyledContent.h +++ b/mozilla/content/base/public/nsIStyledContent.h @@ -52,10 +52,9 @@ public: * an attribute on this node changes. * This only applies to attributes that map their value * DIRECTLY into style contexts via NON-CSS style rules - * Only HTML currently does this. * All other attributes return NS_STYLE_HINT_CONTENT */ - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const = 0; }; diff --git a/mozilla/content/base/src/nsContentList.h b/mozilla/content/base/src/nsContentList.h index 404dc724b6a..a8b32420ba5 100644 --- a/mozilla/content/base/src/nsContentList.h +++ b/mozilla/content/base/src/nsContentList.h @@ -127,6 +127,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { return NS_OK; } NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 8e2d2568a4b..9c591f898e7 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -1703,6 +1703,7 @@ NS_IMETHODIMP nsDocument::AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { NS_ABORT_IF_FALSE(aChild, "Null child!"); @@ -1713,7 +1714,7 @@ nsDocument::AttributeChanged(nsIContent* aChild, // observers remove themselves during the loop. for (i = 0; i < mObservers.Count(); i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; - nsresult rv = observer->AttributeChanged(this, aChild, aNameSpaceID, aAttribute, aHint); + nsresult rv = observer->AttributeChanged(this, aChild, aNameSpaceID, aAttribute, aModType, aHint); if (NS_FAILED(rv) && NS_SUCCEEDED(result)) result = rv; // Make sure that the observer didn't remove itself during the diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 096892be288..74cb94358f7 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -151,6 +151,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { return NS_OK; } NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, @@ -430,6 +431,7 @@ public: NS_IMETHOD AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIContent* aContainer, PRInt32 aNewIndexInContainer); diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 5d8509a9aa6..c0faaf30147 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -1825,7 +1825,7 @@ nsGenericElement::WalkInlineStyleRules(nsIRuleWalker* aRuleWalker) } NS_IMETHODIMP -nsGenericElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsGenericElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { aHint = NS_STYLE_HINT_CONTENT; // by default, never map attributes to style @@ -3080,7 +3080,8 @@ nsGenericContainerElement::SetAttr(nsINodeInfo* aNodeInfo, } if (aNotify) { - mDocument->AttributeChanged(this, nameSpaceID, name, + PRInt32 modHint = modification ? nsIDOMMutationEvent::MODIFICATION : nsIDOMMutationEvent::ADDITION; + mDocument->AttributeChanged(this, nameSpaceID, name, modHint, NS_STYLE_HINT_UNKNOWN); mDocument->EndUpdate(); } @@ -3206,7 +3207,7 @@ nsGenericContainerElement::UnsetAttr(PRInt32 aNameSpaceID, binding->AttributeChanged(aName, aNameSpaceID, PR_TRUE); if (aNotify) { - mDocument->AttributeChanged(this, aNameSpaceID, aName, + mDocument->AttributeChanged(this, aNameSpaceID, aName, nsIDOMMutationEvent::REMOVAL, NS_STYLE_HINT_UNKNOWN); mDocument->EndUpdate(); } diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h index cafcb77dcba..f3d15f2f686 100644 --- a/mozilla/content/base/src/nsGenericElement.h +++ b/mozilla/content/base/src/nsGenericElement.h @@ -275,7 +275,7 @@ public: NS_IMETHOD HasClass(nsIAtom* aClass) const; NS_IMETHOD WalkContentStyleRules(nsIRuleWalker* aRuleWalker); NS_IMETHOD WalkInlineStyleRules(nsIRuleWalker* aRuleWalker); - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; // nsIXMLContent interface methods diff --git a/mozilla/content/base/src/nsStyleSet.cpp b/mozilla/content/base/src/nsStyleSet.cpp index a903523d6fa..75094c96d2e 100644 --- a/mozilla/content/base/src/nsStyleSet.cpp +++ b/mozilla/content/base/src/nsStyleSet.cpp @@ -162,6 +162,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); // See nsStyleConsts fot hint values // xxx style rules enumeration @@ -1221,10 +1222,11 @@ StyleSetImpl::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { return mFrameConstructor->AttributeChanged(aPresContext, aContent, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); } diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index 92ba9691d8a..a6e97663874 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -189,6 +189,7 @@ nsDOMCSSAttributeDeclaration::RemoveProperty(const nsAReadableString& aPropertyN if (doc) { doc->AttributeChanged(mContent, kNameSpaceID_None, nsHTMLAtoms::style, + nsIDOMMutationEvent::MODIFICATION, hint); doc->EndUpdate(); } @@ -341,7 +342,7 @@ nsDOMCSSAttributeDeclaration::ParseDeclaration(const nsAReadableString& aDecl, if (doc) { if (NS_SUCCEEDED(result) && result != NS_CSS_PARSER_DROP_DECLARATION) { doc->AttributeChanged(mContent, kNameSpaceID_None, - nsHTMLAtoms::style, hint); + nsHTMLAtoms::style, nsIDOMMutationEvent::MODIFICATION, hint); } doc->EndUpdate(); } @@ -1502,7 +1503,8 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, // set as string value to avoid another string copy PRBool impact = NS_STYLE_HINT_NONE; - GetMappedAttributeImpact(aAttribute, impact); + PRInt32 modHint = modification ? nsIDOMMutationEvent::MODIFICATION : nsIDOMMutationEvent::ADDITION; + GetMappedAttributeImpact(aAttribute, modHint, impact); nsCOMPtr sheet(dont_AddRef(GetAttrStyleSheet(mDocument))); if (sheet) { // set attr via style sheet @@ -1560,7 +1562,8 @@ nsGenericHTMLElement::SetAttr(PRInt32 aNameSpaceID, } if (aNotify) { - mDocument->AttributeChanged(this, aNameSpaceID, aAttribute, + PRInt32 modHint = modification ? nsIDOMMutationEvent::MODIFICATION : nsIDOMMutationEvent::ADDITION; + mDocument->AttributeChanged(this, aNameSpaceID, aAttribute, modHint, NS_STYLE_HINT_UNKNOWN); mDocument->EndUpdate(); } @@ -1655,7 +1658,7 @@ nsGenericHTMLElement::SetHTMLAttribute(nsIAtom* aAttribute, nsresult result = NS_OK; PRBool impact = NS_STYLE_HINT_NONE; - GetMappedAttributeImpact(aAttribute, impact); + GetMappedAttributeImpact(aAttribute, nsIDOMMutationEvent::MODIFICATION, impact); nsCOMPtr sheet; if (mDocument) { if (aNotify) { @@ -1718,7 +1721,7 @@ nsGenericHTMLElement::SetHTMLAttribute(nsIAtom* aAttribute, } if (aNotify) { - mDocument->AttributeChanged(this, kNameSpaceID_None, aAttribute, impact); + mDocument->AttributeChanged(this, kNameSpaceID_None, aAttribute, nsIDOMMutationEvent::MODIFICATION, impact); mDocument->EndUpdate(); } } @@ -1825,7 +1828,7 @@ nsGenericHTMLElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRBoo binding->AttributeChanged(aAttribute, aNameSpaceID, PR_TRUE); if (aNotify) { - mDocument->AttributeChanged(this, aNameSpaceID, aAttribute, impact); + mDocument->AttributeChanged(this, aNameSpaceID, aAttribute, nsIDOMMutationEvent::REMOVAL, impact); mDocument->EndUpdate(); } } @@ -2288,6 +2291,7 @@ nsGenericHTMLElement::AttributeToString(nsIAtom* aAttribute, NS_IMETHODIMP nsGenericHTMLElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, + PRInt32 aModType, PRInt32& aHint) const { if (!GetCommonMappedAttributesImpact(aAttribute, aHint)) { diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.h b/mozilla/content/html/content/src/nsGenericHTMLElement.h index 49b5281a9a4..a611ab6a458 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.h +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.h @@ -160,7 +160,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; diff --git a/mozilla/content/html/content/src/nsHTMLAppletElement.cpp b/mozilla/content/html/content/src/nsHTMLAppletElement.cpp index 0a125086fcd..0ee4b9f9cb8 100644 --- a/mozilla/content/html/content/src/nsHTMLAppletElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLAppletElement.cpp @@ -69,7 +69,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -216,7 +216,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLAppletElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLAppletElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (!GetCommonMappedAttributesImpact(aAttribute, aHint)) { diff --git a/mozilla/content/html/content/src/nsHTMLBRElement.cpp b/mozilla/content/html/content/src/nsHTMLBRElement.cpp index c5d49a3d1ef..58d57ce8e46 100644 --- a/mozilla/content/html/content/src/nsHTMLBRElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLBRElement.cpp @@ -59,7 +59,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -199,7 +199,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLBRElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLBRElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (!GetCommonMappedAttributesImpact(aAttribute, aHint)) { diff --git a/mozilla/content/html/content/src/nsHTMLBaseFontElement.cpp b/mozilla/content/html/content/src/nsHTMLBaseFontElement.cpp index 362da3f18b0..40e861c4de9 100644 --- a/mozilla/content/html/content/src/nsHTMLBaseFontElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLBaseFontElement.cpp @@ -52,7 +52,7 @@ public: // nsIDOMHTMLBaseElement NS_DECL_NSIDOMHTMLBASEFONTELEMENT - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -140,7 +140,7 @@ NS_IMPL_STRING_ATTR(nsHTMLBaseFontElement, Size, size) NS_IMETHODIMP -nsHTMLBaseFontElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLBaseFontElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((nsHTMLAtoms::color == aAttribute) || diff --git a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp index f622c6bbc13..c10524407cc 100644 --- a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp @@ -215,7 +215,7 @@ public: NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD WalkContentStyleRules(nsIRuleWalker* aRuleWalker); NS_IMETHOD WalkInlineStyleRules(nsIRuleWalker* aRuleWalker); - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -1052,7 +1052,7 @@ nsHTMLBodyElement::WalkInlineStyleRules(nsIRuleWalker* aRuleWalker) } NS_IMETHODIMP -nsHTMLBodyElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLBodyElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::link) || diff --git a/mozilla/content/html/content/src/nsHTMLDListElement.cpp b/mozilla/content/html/content/src/nsHTMLDListElement.cpp index 81d14a53a2d..a65a2cbfecd 100644 --- a/mozilla/content/html/content/src/nsHTMLDListElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLDListElement.cpp @@ -57,7 +57,7 @@ public: NS_IMETHOD StringToAttribute(nsIAtom* aAttribute, const nsAReadableString& aValue, nsHTMLValue& aResult); - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -162,7 +162,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLDListElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLDListElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::compact) { diff --git a/mozilla/content/html/content/src/nsHTMLDirectoryElement.cpp b/mozilla/content/html/content/src/nsHTMLDirectoryElement.cpp index 18148ac6846..b15fdb7e53b 100644 --- a/mozilla/content/html/content/src/nsHTMLDirectoryElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLDirectoryElement.cpp @@ -64,7 +64,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -206,7 +206,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLDirectoryElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLDirectoryElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::type) { diff --git a/mozilla/content/html/content/src/nsHTMLDivElement.cpp b/mozilla/content/html/content/src/nsHTMLDivElement.cpp index f0746613a76..6047a87af62 100644 --- a/mozilla/content/html/content/src/nsHTMLDivElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLDivElement.cpp @@ -62,7 +62,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -213,7 +213,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLDivElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLDivElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::align) { diff --git a/mozilla/content/html/content/src/nsHTMLEmbedElement.cpp b/mozilla/content/html/content/src/nsHTMLEmbedElement.cpp index 1734c839616..43eec3be8a9 100644 --- a/mozilla/content/html/content/src/nsHTMLEmbedElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLEmbedElement.cpp @@ -54,7 +54,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -184,7 +184,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLEmbedElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLEmbedElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (!GetCommonMappedAttributesImpact(aAttribute, aHint)) { diff --git a/mozilla/content/html/content/src/nsHTMLFontElement.cpp b/mozilla/content/html/content/src/nsHTMLFontElement.cpp index 1a274bbf631..090d50cc4ca 100644 --- a/mozilla/content/html/content/src/nsHTMLFontElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFontElement.cpp @@ -68,7 +68,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -297,7 +297,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLFontElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLFontElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::color) { diff --git a/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp b/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp index 29b1a6074e2..138d5aa9d50 100644 --- a/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp @@ -58,7 +58,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -182,7 +182,7 @@ nsHTMLFrameSetElement::AttributeToString(nsIAtom* aAttribute, } NS_IMETHODIMP -nsHTMLFrameSetElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLFrameSetElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::rows) || diff --git a/mozilla/content/html/content/src/nsHTMLHRElement.cpp b/mozilla/content/html/content/src/nsHTMLHRElement.cpp index 348a61f926a..0a259b136af 100644 --- a/mozilla/content/html/content/src/nsHTMLHRElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLHRElement.cpp @@ -59,7 +59,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -257,7 +257,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLHRElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLHRElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::noshade) { diff --git a/mozilla/content/html/content/src/nsHTMLHeadingElement.cpp b/mozilla/content/html/content/src/nsHTMLHeadingElement.cpp index 2791126d317..8ede2c3a97c 100644 --- a/mozilla/content/html/content/src/nsHTMLHeadingElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLHeadingElement.cpp @@ -59,7 +59,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -195,7 +195,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLHeadingElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLHeadingElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::align) { diff --git a/mozilla/content/html/content/src/nsHTMLIFrameElement.cpp b/mozilla/content/html/content/src/nsHTMLIFrameElement.cpp index 6f5445a93bd..a3458c0e3a1 100644 --- a/mozilla/content/html/content/src/nsHTMLIFrameElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLIFrameElement.cpp @@ -72,7 +72,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -323,7 +323,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLIFrameElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLIFrameElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::width) || diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index 47bb5764af2..dbcb495c878 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -118,7 +118,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, nsEvent* aEvent, @@ -537,7 +537,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, NS_IMETHODIMP -nsHTMLImageElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLImageElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::usemap) || diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index b41f4df5eb8..82e207294db 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -195,7 +195,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, nsEvent* aEvent, @@ -1419,7 +1419,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLInputElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLInputElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::value) { diff --git a/mozilla/content/html/content/src/nsHTMLLIElement.cpp b/mozilla/content/html/content/src/nsHTMLLIElement.cpp index 3af5a040a3b..f2b64c122c8 100644 --- a/mozilla/content/html/content/src/nsHTMLLIElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLIElement.cpp @@ -59,7 +59,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -221,7 +221,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLLIElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLLIElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::type) { diff --git a/mozilla/content/html/content/src/nsHTMLMapElement.cpp b/mozilla/content/html/content/src/nsHTMLMapElement.cpp index 36af4020b8e..cb7f24aada1 100644 --- a/mozilla/content/html/content/src/nsHTMLMapElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLMapElement.cpp @@ -56,7 +56,7 @@ public: // nsIDOMHTMLMapElement NS_DECL_NSIDOMHTMLMAPELEMENT - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SetDocument(nsIDocument* aDocument, PRBool aDeep, PRBool aCompileEventHandlers); @@ -196,7 +196,7 @@ NS_IMPL_STRING_ATTR(nsHTMLMapElement, Name, name) NS_IMETHODIMP -nsHTMLMapElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLMapElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::name) { diff --git a/mozilla/content/html/content/src/nsHTMLMenuElement.cpp b/mozilla/content/html/content/src/nsHTMLMenuElement.cpp index 7c3753785c4..b97b0466849 100644 --- a/mozilla/content/html/content/src/nsHTMLMenuElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLMenuElement.cpp @@ -66,7 +66,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -206,7 +206,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLMenuElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLMenuElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::type) { diff --git a/mozilla/content/html/content/src/nsHTMLOListElement.cpp b/mozilla/content/html/content/src/nsHTMLOListElement.cpp index bb89814c4be..a81e7cc27d6 100644 --- a/mozilla/content/html/content/src/nsHTMLOListElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOListElement.cpp @@ -60,7 +60,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -242,7 +242,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLOListElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLOListElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::type) { diff --git a/mozilla/content/html/content/src/nsHTMLObjectElement.cpp b/mozilla/content/html/content/src/nsHTMLObjectElement.cpp index 4a1b20632cf..b54036048a7 100644 --- a/mozilla/content/html/content/src/nsHTMLObjectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLObjectElement.cpp @@ -55,7 +55,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -227,7 +227,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLObjectElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLObjectElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (!GetCommonMappedAttributesImpact(aAttribute, aHint)) { diff --git a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp index f22d2f4a445..7a53433c8c1 100644 --- a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp @@ -83,7 +83,7 @@ public: NS_IMETHOD StringToAttribute(nsIAtom* aAttribute, const nsAReadableString& aValue, nsHTMLValue& aResult); - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -465,7 +465,7 @@ nsHTMLOptionElement::StringToAttribute(nsIAtom* aAttribute, } NS_IMETHODIMP -nsHTMLOptionElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLOptionElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::label) { diff --git a/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp b/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp index 1f7b9316319..7eea3be55c3 100644 --- a/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp @@ -62,7 +62,7 @@ public: NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, nsAWritableString& aResult) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -197,7 +197,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLParagraphElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLParagraphElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::align) { diff --git a/mozilla/content/html/content/src/nsHTMLPreElement.cpp b/mozilla/content/html/content/src/nsHTMLPreElement.cpp index 214e8d6e491..3d1575cb270 100644 --- a/mozilla/content/html/content/src/nsHTMLPreElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLPreElement.cpp @@ -61,7 +61,7 @@ public: NS_IMETHOD StringToAttribute(nsIAtom* aAttribute, const nsAReadableString& aValue, nsHTMLValue& aResult); - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -239,7 +239,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLPreElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLPreElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::variable) || diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp index b77831c758d..b2c0bdc1730 100644 --- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp @@ -159,7 +159,7 @@ public: const nsAReadableString& aValue, nsHTMLValue& aResult); NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; protected: @@ -1346,7 +1346,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLSelectElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLSelectElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::multiple) { diff --git a/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp b/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp index 4a1b20632cf..b54036048a7 100644 --- a/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSharedObjectElement.cpp @@ -55,7 +55,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -227,7 +227,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLObjectElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLObjectElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (!GetCommonMappedAttributesImpact(aAttribute, aHint)) { diff --git a/mozilla/content/html/content/src/nsHTMLSpacerElement.cpp b/mozilla/content/html/content/src/nsHTMLSpacerElement.cpp index 0468673b26c..01803472bda 100644 --- a/mozilla/content/html/content/src/nsHTMLSpacerElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSpacerElement.cpp @@ -72,7 +72,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -273,7 +273,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, NS_IMETHODIMP -nsHTMLSpacerElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLSpacerElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::usemap) || diff --git a/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp b/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp index 9e35cd0938a..11be8a6de95 100644 --- a/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp @@ -60,7 +60,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -199,7 +199,7 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat } NS_IMETHODIMP -nsHTMLTableCaptionElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLTableCaptionElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::align) { diff --git a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp index 61bde0fb2a8..03a2e443f22 100644 --- a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp @@ -69,7 +69,7 @@ public: nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD WalkContentStyleRules(nsIRuleWalker* aRuleWalker); - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -467,7 +467,7 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat } NS_IMETHODIMP -nsHTMLTableCellElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLTableCellElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::align) || diff --git a/mozilla/content/html/content/src/nsHTMLTableColElement.cpp b/mozilla/content/html/content/src/nsHTMLTableColElement.cpp index 958bb565938..4822fec19ff 100644 --- a/mozilla/content/html/content/src/nsHTMLTableColElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableColElement.cpp @@ -65,7 +65,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -290,7 +290,7 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat } NS_IMETHODIMP -nsHTMLTableColElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLTableColElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::width) || diff --git a/mozilla/content/html/content/src/nsHTMLTableColGroupElement.cpp b/mozilla/content/html/content/src/nsHTMLTableColGroupElement.cpp index 401d4e2ced5..b5f52a0a2bd 100644 --- a/mozilla/content/html/content/src/nsHTMLTableColGroupElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableColGroupElement.cpp @@ -60,7 +60,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -279,7 +279,7 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat } NS_IMETHODIMP -nsHTMLTableColGroupElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLTableColGroupElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::width) || diff --git a/mozilla/content/html/content/src/nsHTMLTableElement.cpp b/mozilla/content/html/content/src/nsHTMLTableElement.cpp index f141fc813ed..1c9b1d1c4f9 100644 --- a/mozilla/content/html/content/src/nsHTMLTableElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableElement.cpp @@ -74,7 +74,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -1456,7 +1456,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLTableElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLTableElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::layout) || diff --git a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp index 904aa9f1635..b89f83e7beb 100644 --- a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp @@ -171,7 +171,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -615,7 +615,7 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat } NS_IMETHODIMP -nsHTMLTableRowElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLTableRowElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::align) || diff --git a/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp b/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp index 458e7e0b2e4..3ec035bff6b 100644 --- a/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp @@ -64,7 +64,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; @@ -357,7 +357,7 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat } NS_IMETHODIMP -nsHTMLTableSectionElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLTableSectionElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if ((aAttribute == nsHTMLAtoms::align) || diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp index c3121d055a9..f2c4ca1a889 100644 --- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -87,7 +87,7 @@ public: const nsAReadableString& aValue, nsHTMLValue& aResult); NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, nsEvent* aEvent, nsIDOMEvent** aDOMEvent, PRUint32 aFlags, @@ -477,7 +477,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, } NS_IMETHODIMP -nsHTMLTextAreaElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLTextAreaElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { // XXX Bug 50280 - It is unclear why we need to do this here for diff --git a/mozilla/content/html/content/src/nsHTMLUListElement.cpp b/mozilla/content/html/content/src/nsHTMLUListElement.cpp index 5045ff50bc3..8c54ef749d1 100644 --- a/mozilla/content/html/content/src/nsHTMLUListElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLUListElement.cpp @@ -63,7 +63,7 @@ public: const nsHTMLValue& aValue, nsAWritableString& aResult) const; NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const; }; @@ -223,7 +223,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aD } NS_IMETHODIMP -nsHTMLUListElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, +nsHTMLUListElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const { if (aAttribute == nsHTMLAtoms::type) { diff --git a/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp b/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp index 9639d1d6948..91d24624b47 100644 --- a/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLUnknownElement.cpp @@ -35,7 +35,7 @@ #include "nsIHTMLStyleSheet.h" #include "nsIHTMLContentContainer.h" #include "nsIHTMLAttributes.h" - +#include "nsIDOMMutationEvent.h" class nsHTMLUnknownElement : public nsGenericHTMLContainerElement, public nsIDOMHTMLElement @@ -255,7 +255,7 @@ nsHTMLUnknownElement::SetAttribute(PRInt32 aNameSpaceID, // set as string value to avoid another string copy PRBool impact = NS_STYLE_HINT_NONE; - GetMappedAttributeImpact(aAttribute, impact); + GetMappedAttributeImpact(aAttribute, nsIDOMMutationEvent::MODIFICATION, impact); nsCOMPtr sheet(dont_AddRef(GetAttrStyleSheet(mDocument))); if (sheet) { // set attr via style sheet @@ -279,7 +279,7 @@ nsHTMLUnknownElement::SetAttribute(PRInt32 aNameSpaceID, } if (aNotify && (mDocument)) { - result = mDocument->AttributeChanged(this, aNameSpaceID, aAttribute, + result = mDocument->AttributeChanged(this, aNameSpaceID, aAttribute, nsIDOMMutationEvent::MODIFICATION, NS_STYLE_HINT_UNKNOWN); mDocument->EndUpdate(); } diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index e07f7325947..69768532c40 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -271,6 +271,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { return NS_OK; } NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 4e8131edc69..99a1f6afcdd 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -1251,7 +1251,7 @@ nsHTMLDocument::AttributeWillChange(nsIContent* aContent, PRInt32 aNameSpaceID, NS_IMETHODIMP nsHTMLDocument::AttributeChanged(nsIContent* aContent, PRInt32 aNameSpaceID, - nsIAtom* aAttribute, PRInt32 aHint) + nsIAtom* aAttribute, PRInt32 aModType, PRInt32 aHint) { NS_ABORT_IF_FALSE(aContent, "Null content!"); @@ -1284,7 +1284,7 @@ nsHTMLDocument::AttributeChanged(nsIContent* aContent, PRInt32 aNameSpaceID, } } - return nsDocument::AttributeChanged(aContent, aNameSpaceID, aAttribute, + return nsDocument::AttributeChanged(aContent, aNameSpaceID, aAttribute, aModType, aHint); } diff --git a/mozilla/content/html/document/src/nsHTMLDocument.h b/mozilla/content/html/document/src/nsHTMLDocument.h index 1e3adb63e98..3d29f5738c5 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.h +++ b/mozilla/content/html/document/src/nsHTMLDocument.h @@ -120,6 +120,7 @@ public: NS_IMETHOD AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD AttributeWillChange(nsIContent* aChild, PRInt32 aNameSpaceID, diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp index 010d4a6033f..dbddd546495 100644 --- a/mozilla/content/xbl/src/nsBindingManager.cpp +++ b/mozilla/content/xbl/src/nsBindingManager.cpp @@ -373,6 +373,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { return NS_OK; } NS_IMETHOD ContentAppended(nsIDocument* aDocument, nsIContent* aContainer, diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index 9ac49b0466e..a89d7253ed4 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -3085,7 +3085,9 @@ nsXULElement::SetAttr(nsINodeInfo* aNodeInfo, (tagName.get() == nsXULAtoms::command) || (tagName.get() == nsXULAtoms::key)) return rv; - mDocument->AttributeChanged(this, attrns, attrName, + + PRInt32 modHint = modification ? nsIDOMMutationEvent::MODIFICATION : nsIDOMMutationEvent::ADDITION; + mDocument->AttributeChanged(this, attrns, attrName, modHint, NS_STYLE_HINT_UNKNOWN); } } @@ -3340,7 +3342,7 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, (tagName.get() == nsXULAtoms::key)) return rv; mDocument->AttributeChanged(NS_STATIC_CAST(nsIStyledContent*, this), - aNameSpaceID, aName, + aNameSpaceID, aName, nsIDOMMutationEvent::REMOVAL, NS_STYLE_HINT_UNKNOWN); } } @@ -4310,12 +4312,24 @@ nsXULElement::WalkInlineStyleRules(nsIRuleWalker* aRuleWalker) } NS_IMETHODIMP -nsXULElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, - PRInt32& aHint) const +nsXULElement::GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, + PRInt32& aHint) const { aHint = NS_STYLE_HINT_CONTENT; // by default, never map attributes to style - if (aAttribute == nsXULAtoms::value || aAttribute == nsXULAtoms::flex || + if (aAttribute == nsXULAtoms::value && + (aModType == nsIDOMMutationEvent::REMOVAL || aModType == nsIDOMMutationEvent::ADDITION)) { + nsCOMPtr tag; + GetTag(*getter_AddRefs(tag)); + if (tag.get() == nsXULAtoms::label || tag.get() == nsXULAtoms::description) + // Label and description dynamically morph between a normal block and a cropping single-line + // XUL text frame. If the value attribute is being added or removed, then we need to return + // a hint of frame change. (See bugzilla bug 95475 for details.) + aHint = NS_STYLE_HINT_FRAMECHANGE; + else + aHint = NS_STYLE_HINT_ATTRCHANGE; + } + else if (aAttribute == nsXULAtoms::value || aAttribute == nsXULAtoms::flex || aAttribute == nsXULAtoms::label) { // VERY IMPORTANT! This has a huge positive performance impact! aHint = NS_STYLE_HINT_ATTRCHANGE; diff --git a/mozilla/content/xul/content/src/nsXULElement.h b/mozilla/content/xul/content/src/nsXULElement.h index 452c1a7d1d5..6f1822ce30c 100644 --- a/mozilla/content/xul/content/src/nsXULElement.h +++ b/mozilla/content/xul/content/src/nsXULElement.h @@ -421,7 +421,7 @@ public: NS_IMETHOD WalkContentStyleRules(nsIRuleWalker* aRuleWalker); NS_IMETHOD WalkInlineStyleRules(nsIRuleWalker* aRuleWalker); - NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, + NS_IMETHOD GetMappedAttributeImpact(const nsIAtom* aAttribute, PRInt32 aModType, PRInt32& aHint) const; diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 87fd6fd808d..4e93aadcee6 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -1714,6 +1714,7 @@ NS_IMETHODIMP nsXULDocument::AttributeChanged(nsIContent* aElement, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv; @@ -1737,7 +1738,7 @@ nsXULDocument::AttributeChanged(nsIContent* aElement, // Now notify external observers for (PRInt32 i = 0; i < mObservers.Count(); i++) { nsIDocumentObserver* observer = (nsIDocumentObserver*)mObservers[i]; - observer->AttributeChanged(this, aElement, aNameSpaceID, aAttribute, aHint); + observer->AttributeChanged(this, aElement, aNameSpaceID, aAttribute, aModType, aHint); if (observer != (nsIDocumentObserver*)mObservers.ElementAt(i)) { i--; } diff --git a/mozilla/content/xul/document/src/nsXULDocument.h b/mozilla/content/xul/document/src/nsXULDocument.h index 0c4807d4672..f02ef7f9489 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.h +++ b/mozilla/content/xul/document/src/nsXULDocument.h @@ -260,6 +260,7 @@ public: NS_IMETHOD AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); // See nsStyleConsts fot hint values NS_IMETHOD ContentAppended(nsIContent* aContainer, diff --git a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp index 5afbeb60f1b..baabbe22d2c 100644 --- a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp @@ -96,6 +96,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD DocumentWillBeDestroyed(nsIDocument* aDocument); @@ -1776,6 +1777,7 @@ nsXULContentBuilder::AttributeChanged(nsIDocument* aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // Handle "open" and "close" cases. We do this handling before @@ -1796,7 +1798,7 @@ nsXULContentBuilder::AttributeChanged(nsIDocument* aDocument, } // Pass along to the generic template builder. - return nsXULTemplateBuilder::AttributeChanged(aDocument, aContent, aNameSpaceID, aAttribute, aHint); + return nsXULTemplateBuilder::AttributeChanged(aDocument, aContent, aNameSpaceID, aAttribute, aModType, aHint); } NS_IMETHODIMP diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp index 9556c2292a3..13fd1291604 100644 --- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -320,6 +320,7 @@ nsXULTemplateBuilder::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // Check for a change to the 'ref' attribute on an atom, in which diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.h b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.h index e24b3902100..5d72cb69230 100644 --- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.h +++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.h @@ -102,6 +102,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 05aa557a4d9..ac3942e7338 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -10037,6 +10037,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult result = NS_OK; @@ -10064,7 +10065,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, if (NS_OK == result) { // Get style hint from HTML content object. - styledContent->GetMappedAttributeImpact(aAttribute, aHint); + styledContent->GetMappedAttributeImpact(aAttribute, aModType, aHint); NS_RELEASE(styledContent); } } @@ -10152,7 +10153,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, // apply changes if (primaryFrame && aHint == NS_STYLE_HINT_ATTRCHANGE) - result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aHint); + result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aModType, aHint); else if (reconstruct) { result = ReconstructDocElementHierarchy(aPresContext); } @@ -10225,7 +10226,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, primaryFrame->GetParent(&pCanvasFrameCandidate); while (pCanvasFrameCandidate) { if (IsCanvasFrame(pCanvasFrameCandidate)) { - pCanvasFrameCandidate->AttributeChanged(aPresContext,aContent,aNameSpaceID,aAttribute,maxHint); + pCanvasFrameCandidate->AttributeChanged(aPresContext,aContent,aNameSpaceID,aAttribute,aModType,maxHint); break; } else { pCanvasFrameCandidate->GetParent(&pCanvasFrameCandidate); @@ -10235,7 +10236,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, } // let the frame deal with it, since we don't know how to - result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, maxHint); + result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aModType, maxHint); default: break; } diff --git a/mozilla/layout/base/nsCSSFrameConstructor.h b/mozilla/layout/base/nsCSSFrameConstructor.h index 26f1324e9e5..8bc01e66427 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.h +++ b/mozilla/layout/base/nsCSSFrameConstructor.h @@ -105,6 +105,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); // Style change notifications diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 5f65c0deb25..6580268d445 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -1002,6 +1002,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, @@ -4944,10 +4945,11 @@ PresShell::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { WillCauseReflow(); - nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aNameSpaceID, aAttribute, aHint); + nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aNameSpaceID, aAttribute, aModType, aHint); VERIFY_STYLE_TREE; DidCauseReflow(); return rv; diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index c1b2914823d..803cb975d48 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -724,6 +724,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) = 0; /** diff --git a/mozilla/layout/base/public/nsIStyleFrameConstruction.h b/mozilla/layout/base/public/nsIStyleFrameConstruction.h index 93577a2b177..af1e478770b 100644 --- a/mozilla/layout/base/public/nsIStyleFrameConstruction.h +++ b/mozilla/layout/base/public/nsIStyleFrameConstruction.h @@ -200,6 +200,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) = 0; diff --git a/mozilla/layout/base/public/nsIStyleSet.h b/mozilla/layout/base/public/nsIStyleSet.h index c7dc01188d3..b52f4527e24 100644 --- a/mozilla/layout/base/public/nsIStyleSet.h +++ b/mozilla/layout/base/public/nsIStyleSet.h @@ -177,6 +177,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) = 0; // See nsStyleConsts fot hint values // Style change notifications diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index 946c53dae57..086ef334263 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -544,6 +544,7 @@ nsFileControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // set the text control to readonly or not @@ -563,7 +564,7 @@ nsFileControlFrame::AttributeChanged(nsIPresContext* aPresContext, } } - return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } NS_IMETHODIMP diff --git a/mozilla/layout/forms/nsFileControlFrame.h b/mozilla/layout/forms/nsFileControlFrame.h index 19118f51bc7..f5536bf327b 100644 --- a/mozilla/layout/forms/nsFileControlFrame.h +++ b/mozilla/layout/forms/nsFileControlFrame.h @@ -88,6 +88,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); virtual PRInt32 GetMaxNumValues(); diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp index ccd3537f124..92d10a74f83 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp @@ -539,6 +539,7 @@ nsGfxButtonControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = NS_OK; @@ -558,7 +559,7 @@ nsGfxButtonControlFrame::AttributeChanged(nsIPresContext* aPresContext, // defer to HTMLButtonControlFrame } else { - rv = nsHTMLButtonControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + rv = nsHTMLButtonControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } return rv; } diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.h b/mozilla/layout/forms/nsGfxButtonControlFrame.h index ad660f6fab6..301c5aae4e5 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.h +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.h @@ -98,6 +98,7 @@ protected: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp index 191d0945ca6..7239a058198 100644 --- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp @@ -235,6 +235,7 @@ nsGfxCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { if ( aAttribute == GetTristateAtom() ) { @@ -254,7 +255,7 @@ nsGfxCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext, } } else - return nsFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + return nsFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); return NS_OK; } diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.h b/mozilla/layout/forms/nsGfxCheckboxControlFrame.h index 67d3e7ec400..0cfa9e9bc6e 100644 --- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.h +++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.h @@ -64,6 +64,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) ; NS_IMETHOD Paint(nsIPresContext* aPresContext, diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index 799c9554a9b..d2668aea130 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -327,13 +327,14 @@ nsIsIndexFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = NS_OK; if (nsHTMLAtoms::prompt == aAttribute) { rv = UpdatePromptLabel(); } else { - rv = nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + rv = nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } return rv; } diff --git a/mozilla/layout/forms/nsIsIndexFrame.h b/mozilla/layout/forms/nsIsIndexFrame.h index e735d272ac2..f1a2e82cd1d 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.h +++ b/mozilla/layout/forms/nsIsIndexFrame.h @@ -99,6 +99,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); void SetFocus(PRBool aOn, PRBool aRepaint); diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index f9c2f4da231..2eafaeeca5c 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -2668,10 +2668,11 @@ nsBlockFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (NS_FAILED(rv)) { return rv; diff --git a/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h index 166b9cd4426..3c38ecd964d 100644 --- a/mozilla/layout/generic/nsBlockFrame.h +++ b/mozilla/layout/generic/nsBlockFrame.h @@ -124,6 +124,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef DO_SELECTION diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index de12a4eaeb4..8d6faaa6e2d 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -1954,6 +1954,7 @@ nsFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { return NS_OK; diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index ae5ad9c6344..bf978af3073 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -238,6 +238,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentStateChanged(nsIPresContext* aPresContext, nsIContent* aChild, diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index a8acf5448c3..d98d214f412 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -161,6 +161,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef ACCESSIBILITY @@ -501,6 +502,7 @@ nsHTMLFrameOuterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { if (nsHTMLAtoms::src == aAttribute) { diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 7890254a477..c0d0fa392d2 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -98,6 +98,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, @@ -857,6 +858,7 @@ nsGfxScrollFrameInner::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { if (mHScrollbarBox && mVScrollbarBox) diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index e78dde6365c..fefa6855f73 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -137,6 +137,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef DEBUG @@ -681,6 +682,7 @@ CanvasFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // if the background color or image is changing, invalidate the canvas diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index c1b2914823d..803cb975d48 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -724,6 +724,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) = 0; /** diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 8fa8db38b0c..cea4021bc20 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -1365,10 +1365,11 @@ nsImageFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsLeafFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (NS_OK != rv) { return rv; } diff --git a/mozilla/layout/generic/nsImageFrame.h b/mozilla/layout/generic/nsImageFrame.h index 97eb3699e62..3e539b698a5 100644 --- a/mozilla/layout/generic/nsImageFrame.h +++ b/mozilla/layout/generic/nsImageFrame.h @@ -95,6 +95,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef ACCESSIBILITY diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp index 00419ee7962..0397ed495e3 100644 --- a/mozilla/layout/generic/nsImageMap.cpp +++ b/mozilla/layout/generic/nsImageMap.cpp @@ -1111,6 +1111,7 @@ nsImageMap::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // If the parent of the changing content node is our map then update diff --git a/mozilla/layout/generic/nsImageMap.h b/mozilla/layout/generic/nsImageMap.h index 5be3b205d71..cfa2d6eef9b 100644 --- a/mozilla/layout/generic/nsImageMap.h +++ b/mozilla/layout/generic/nsImageMap.h @@ -99,6 +99,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index f9c2f4da231..2eafaeeca5c 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -2668,10 +2668,11 @@ nsBlockFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (NS_FAILED(rv)) { return rv; diff --git a/mozilla/layout/html/base/src/nsBlockFrame.h b/mozilla/layout/html/base/src/nsBlockFrame.h index 166b9cd4426..3c38ecd964d 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.h +++ b/mozilla/layout/html/base/src/nsBlockFrame.h @@ -124,6 +124,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef DO_SELECTION diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index de12a4eaeb4..8d6faaa6e2d 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -1954,6 +1954,7 @@ nsFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { return NS_OK; diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index ae5ad9c6344..bf978af3073 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -238,6 +238,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentStateChanged(nsIPresContext* aPresContext, nsIContent* aChild, diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp index 7890254a477..c0d0fa392d2 100644 --- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp @@ -98,6 +98,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, @@ -857,6 +858,7 @@ nsGfxScrollFrameInner::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { if (mHScrollbarBox && mVScrollbarBox) diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index e78dde6365c..fefa6855f73 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -137,6 +137,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef DEBUG @@ -681,6 +682,7 @@ CanvasFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // if the background color or image is changing, invalidate the canvas diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 8fa8db38b0c..cea4021bc20 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -1365,10 +1365,11 @@ nsImageFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsLeafFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (NS_OK != rv) { return rv; } diff --git a/mozilla/layout/html/base/src/nsImageFrame.h b/mozilla/layout/html/base/src/nsImageFrame.h index 97eb3699e62..3e539b698a5 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.h +++ b/mozilla/layout/html/base/src/nsImageFrame.h @@ -95,6 +95,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef ACCESSIBILITY diff --git a/mozilla/layout/html/base/src/nsImageMap.cpp b/mozilla/layout/html/base/src/nsImageMap.cpp index 00419ee7962..0397ed495e3 100644 --- a/mozilla/layout/html/base/src/nsImageMap.cpp +++ b/mozilla/layout/html/base/src/nsImageMap.cpp @@ -1111,6 +1111,7 @@ nsImageMap::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // If the parent of the changing content node is our map then update diff --git a/mozilla/layout/html/base/src/nsImageMap.h b/mozilla/layout/html/base/src/nsImageMap.h index 5be3b205d71..cfa2d6eef9b 100644 --- a/mozilla/layout/html/base/src/nsImageMap.h +++ b/mozilla/layout/html/base/src/nsImageMap.h @@ -99,6 +99,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 5f65c0deb25..6580268d445 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -1002,6 +1002,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, @@ -4944,10 +4945,11 @@ PresShell::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { WillCauseReflow(); - nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aNameSpaceID, aAttribute, aHint); + nsresult rv = mStyleSet->AttributeChanged(mPresContext, aContent, aNameSpaceID, aAttribute, aModType, aHint); VERIFY_STYLE_TREE; DidCauseReflow(); return rv; diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index a8acf5448c3..d98d214f412 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -161,6 +161,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef ACCESSIBILITY @@ -501,6 +502,7 @@ nsHTMLFrameOuterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { if (nsHTMLAtoms::src == aAttribute) { diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp index 946c53dae57..086ef334263 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp @@ -544,6 +544,7 @@ nsFileControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // set the text control to readonly or not @@ -563,7 +564,7 @@ nsFileControlFrame::AttributeChanged(nsIPresContext* aPresContext, } } - return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } NS_IMETHODIMP diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.h b/mozilla/layout/html/forms/src/nsFileControlFrame.h index 19118f51bc7..f5536bf327b 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.h +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.h @@ -88,6 +88,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); virtual PRInt32 GetMaxNumValues(); diff --git a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp index ccd3537f124..92d10a74f83 100644 --- a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp @@ -539,6 +539,7 @@ nsGfxButtonControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = NS_OK; @@ -558,7 +559,7 @@ nsGfxButtonControlFrame::AttributeChanged(nsIPresContext* aPresContext, // defer to HTMLButtonControlFrame } else { - rv = nsHTMLButtonControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + rv = nsHTMLButtonControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } return rv; } diff --git a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.h b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.h index ad660f6fab6..301c5aae4e5 100644 --- a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.h +++ b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.h @@ -98,6 +98,7 @@ protected: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); diff --git a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp index 191d0945ca6..7239a058198 100644 --- a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp @@ -235,6 +235,7 @@ nsGfxCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { if ( aAttribute == GetTristateAtom() ) { @@ -254,7 +255,7 @@ nsGfxCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext, } } else - return nsFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + return nsFormControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); return NS_OK; } diff --git a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h index 67d3e7ec400..0cfa9e9bc6e 100644 --- a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h +++ b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h @@ -64,6 +64,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) ; NS_IMETHOD Paint(nsIPresContext* aPresContext, diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp index ca9d5c01c38..d2253ae70b2 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp @@ -2927,6 +2927,7 @@ nsGfxTextControlFrame2::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { if (!mEditor || !mSelCon) {return NS_ERROR_NOT_INITIALIZED;} @@ -3026,7 +3027,7 @@ nsGfxTextControlFrame2::AttributeChanged(nsIPresContext* aPresContext, // Allow the base class to handle common attributes supported // by all form elements... else { - rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } return rv; diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h index 331e8638b84..3ab33acab55 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h @@ -152,6 +152,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD GetText(nsString* aText, PRBool aInitialValue); diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp index 799c9554a9b..d2668aea130 100644 --- a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp +++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp @@ -327,13 +327,14 @@ nsIsIndexFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = NS_OK; if (nsHTMLAtoms::prompt == aAttribute) { rv = UpdatePromptLabel(); } else { - rv = nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + rv = nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } return rv; } diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.h b/mozilla/layout/html/forms/src/nsIsIndexFrame.h index e735d272ac2..f1a2e82cd1d 100644 --- a/mozilla/layout/html/forms/src/nsIsIndexFrame.h +++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.h @@ -99,6 +99,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); void SetFocus(PRBool aOn, PRBool aRepaint); diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 05aa557a4d9..ac3942e7338 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -10037,6 +10037,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult result = NS_OK; @@ -10064,7 +10065,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, if (NS_OK == result) { // Get style hint from HTML content object. - styledContent->GetMappedAttributeImpact(aAttribute, aHint); + styledContent->GetMappedAttributeImpact(aAttribute, aModType, aHint); NS_RELEASE(styledContent); } } @@ -10152,7 +10153,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, // apply changes if (primaryFrame && aHint == NS_STYLE_HINT_ATTRCHANGE) - result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aHint); + result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aModType, aHint); else if (reconstruct) { result = ReconstructDocElementHierarchy(aPresContext); } @@ -10225,7 +10226,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, primaryFrame->GetParent(&pCanvasFrameCandidate); while (pCanvasFrameCandidate) { if (IsCanvasFrame(pCanvasFrameCandidate)) { - pCanvasFrameCandidate->AttributeChanged(aPresContext,aContent,aNameSpaceID,aAttribute,maxHint); + pCanvasFrameCandidate->AttributeChanged(aPresContext,aContent,aNameSpaceID,aAttribute,aModType,maxHint); break; } else { pCanvasFrameCandidate->GetParent(&pCanvasFrameCandidate); @@ -10235,7 +10236,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext, } // let the frame deal with it, since we don't know how to - result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, maxHint); + result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aModType, maxHint); default: break; } diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.h b/mozilla/layout/html/style/src/nsCSSFrameConstructor.h index 26f1324e9e5..8bc01e66427 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.h +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.h @@ -105,6 +105,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); // Style change notifications diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index d6dc1ab2743..e9536eff086 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -133,6 +133,7 @@ nsTableCellFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // let the table frame decide what to do diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.h b/mozilla/layout/html/table/src/nsTableCellFrame.h index c92a2778d48..728f0b84eb0 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.h +++ b/mozilla/layout/html/table/src/nsTableCellFrame.h @@ -74,6 +74,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); // table cells contain an area frame which does most of the work, and diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp index 75869ced6b2..251e641de3d 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp @@ -1057,10 +1057,11 @@ nsMathMLContainerFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsHTMLContainerFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (NS_FAILED(rv)) return rv; nsCOMPtr shell; nsCOMPtr reflowCmd; diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h index 0bd497fd00a..4878c212661 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h @@ -136,6 +136,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD diff --git a/mozilla/layout/style/nsStyleSet.cpp b/mozilla/layout/style/nsStyleSet.cpp index a903523d6fa..75094c96d2e 100644 --- a/mozilla/layout/style/nsStyleSet.cpp +++ b/mozilla/layout/style/nsStyleSet.cpp @@ -162,6 +162,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); // See nsStyleConsts fot hint values // xxx style rules enumeration @@ -1221,10 +1222,11 @@ StyleSetImpl::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { return mFrameConstructor->AttributeChanged(aPresContext, aContent, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); } diff --git a/mozilla/layout/svg/base/src/nsPolygonFrame.cpp b/mozilla/layout/svg/base/src/nsPolygonFrame.cpp index fecdd978f80..2460e5b2197 100644 --- a/mozilla/layout/svg/base/src/nsPolygonFrame.cpp +++ b/mozilla/layout/svg/base/src/nsPolygonFrame.cpp @@ -289,6 +289,7 @@ nsPolygonFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { if (aAttribute == nsSVGAtoms::points) { @@ -309,7 +310,7 @@ nsPolygonFrame::AttributeChanged(nsIPresContext* aPresContext, } else if (aAttribute == nsSVGAtoms::x) { } else if (aAttribute == nsSVGAtoms::y) { } - return nsLeafFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + return nsLeafFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } NS_METHOD nsPolygonFrame::RenderPoints(nsIRenderingContext& aRenderingContext, diff --git a/mozilla/layout/svg/base/src/nsPolygonFrame.h b/mozilla/layout/svg/base/src/nsPolygonFrame.h index 33c8414858c..9f786a35d7d 100644 --- a/mozilla/layout/svg/base/src/nsPolygonFrame.h +++ b/mozilla/layout/svg/base/src/nsPolygonFrame.h @@ -94,6 +94,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsString& aValue); diff --git a/mozilla/layout/svg/base/src/nsSVGContainerFrame.cpp b/mozilla/layout/svg/base/src/nsSVGContainerFrame.cpp index b6865caecc1..3bb1a21d42a 100644 --- a/mozilla/layout/svg/base/src/nsSVGContainerFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGContainerFrame.cpp @@ -331,10 +331,11 @@ nsSVGContainerFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsHTMLContainerFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); #if 0 if (aAttribute == nsHTMLAtoms::width || aAttribute == nsHTMLAtoms::height || diff --git a/mozilla/layout/svg/base/src/nsSVGContainerFrame.h b/mozilla/layout/svg/base/src/nsSVGContainerFrame.h index 816d5c7548d..b5664c3527d 100644 --- a/mozilla/layout/svg/base/src/nsSVGContainerFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGContainerFrame.h @@ -67,6 +67,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD Paint ( nsIPresContext* aPresContext, diff --git a/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp b/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp index a129cd4bcf4..c5297081127 100644 --- a/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp @@ -219,9 +219,10 @@ nsSVGPathFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { - return nsLeafFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + return nsLeafFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } diff --git a/mozilla/layout/svg/base/src/nsSVGPathFrame.h b/mozilla/layout/svg/base/src/nsSVGPathFrame.h index 68f22e4dfb8..efcb3fbfff1 100644 --- a/mozilla/layout/svg/base/src/nsSVGPathFrame.h +++ b/mozilla/layout/svg/base/src/nsSVGPathFrame.h @@ -91,6 +91,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsString& aValue); diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index d6dc1ab2743..e9536eff086 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -133,6 +133,7 @@ nsTableCellFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { // let the table frame decide what to do diff --git a/mozilla/layout/tables/nsTableCellFrame.h b/mozilla/layout/tables/nsTableCellFrame.h index c92a2778d48..728f0b84eb0 100644 --- a/mozilla/layout/tables/nsTableCellFrame.h +++ b/mozilla/layout/tables/nsTableCellFrame.h @@ -74,6 +74,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); // table cells contain an area frame which does most of the work, and diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index c704ff2d06e..7975198f307 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -1258,10 +1258,11 @@ nsBoxFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsContainerFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (aAttribute == nsHTMLAtoms::width || aAttribute == nsHTMLAtoms::height || diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.h b/mozilla/layout/xul/base/src/nsBoxFrame.h index e68ff116c20..64536c0c4b0 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsBoxFrame.h @@ -122,6 +122,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); diff --git a/mozilla/layout/xul/base/src/nsDeckFrame.cpp b/mozilla/layout/xul/base/src/nsDeckFrame.cpp index 1f5e01d6199..40b98b7db96 100644 --- a/mozilla/layout/xul/base/src/nsDeckFrame.cpp +++ b/mozilla/layout/xul/base/src/nsDeckFrame.cpp @@ -171,10 +171,11 @@ nsDeckFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); // 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 16537967f25..67827443d59 100644 --- a/mozilla/layout/xul/base/src/nsDeckFrame.h +++ b/mozilla/layout/xul/base/src/nsDeckFrame.h @@ -45,6 +45,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD DoLayout(nsBoxLayoutState& aState); diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp index 3bc89c5f79a..9bbdc91a670 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp @@ -108,6 +108,7 @@ nsImageBoxFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { PRBool aResize; diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.h b/mozilla/layout/xul/base/src/nsImageBoxFrame.h index 9eb5b208916..a399ff15da4 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.h @@ -72,6 +72,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD DidSetStyleContext (nsIPresContext* aPresContext); diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index b8a1f8da8dc..c6cf411fbd5 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -637,6 +637,7 @@ nsMenuFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsAutoString value; diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.h b/mozilla/layout/xul/base/src/nsMenuFrame.h index 229cd5e9ea8..be13165a4d2 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.h +++ b/mozilla/layout/xul/base/src/nsMenuFrame.h @@ -205,6 +205,7 @@ protected: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); virtual ~nsMenuFrame(); diff --git a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp index 2ae89cec98c..d2092f3cff6 100644 --- a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp @@ -82,7 +82,7 @@ nsProgressMeterFrame::SetInitialChildList(nsIPresContext* aPresContext, { // Set up our initial flexes. nsresult rv = nsBoxFrame::SetInitialChildList(aPresContext, aListName, aChildList); - AttributeChanged(aPresContext, mContent, kNameSpaceID_None, nsHTMLAtoms::value, 0); + AttributeChanged(aPresContext, mContent, kNameSpaceID_None, nsHTMLAtoms::value, 0, 0); return rv; } @@ -91,10 +91,11 @@ nsProgressMeterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); 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 bd7eb1adf37..0010002d14c 100644 --- a/mozilla/layout/xul/base/src/nsProgressMeterFrame.h +++ b/mozilla/layout/xul/base/src/nsProgressMeterFrame.h @@ -52,6 +52,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); #ifdef NS_DEBUG diff --git a/mozilla/layout/xul/base/src/nsResizerFrame.cpp b/mozilla/layout/xul/base/src/nsResizerFrame.cpp index ae5fba47f79..b45c0ae1c8a 100644 --- a/mozilla/layout/xul/base/src/nsResizerFrame.cpp +++ b/mozilla/layout/xul/base/src/nsResizerFrame.cpp @@ -329,10 +329,11 @@ nsResizerFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsTitleBarFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (aAttribute == nsXULAtoms::dir ) { diff --git a/mozilla/layout/xul/base/src/nsResizerFrame.h b/mozilla/layout/xul/base/src/nsResizerFrame.h index 5f9b844c1a9..0ea58acd048 100644 --- a/mozilla/layout/xul/base/src/nsResizerFrame.h +++ b/mozilla/layout/xul/base/src/nsResizerFrame.h @@ -63,6 +63,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); virtual void MouseClicked (nsIPresContext* aPresContext); diff --git a/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp b/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp index b69332c5a44..e4906e07690 100644 --- a/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsScrollbarFrame.cpp @@ -82,10 +82,11 @@ nsScrollbarFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); /*// if the current position changes if ( aAttribute == nsXULAtoms::curpos || aAttribute == nsXULAtoms::maxpos || @@ -96,7 +97,7 @@ nsScrollbarFrame::AttributeChanged(nsIPresContext* aPresContext, nsIFrame* slider; nsScrollbarButtonFrame::GetChildWithTag(aPresContext, nsXULAtoms::slider, this, slider); if (slider) - slider->AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + slider->AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } */ diff --git a/mozilla/layout/xul/base/src/nsScrollbarFrame.h b/mozilla/layout/xul/base/src/nsScrollbarFrame.h index ff66ad40c74..85ccc9518b2 100644 --- a/mozilla/layout/xul/base/src/nsScrollbarFrame.h +++ b/mozilla/layout/xul/base/src/nsScrollbarFrame.h @@ -52,6 +52,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp index e8da81d80a9..a59596d81d0 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -218,10 +218,11 @@ nsSliderFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); // if the current position changes if (aAttribute == nsXULAtoms::curpos) { rv = CurrentPositionChanged(aPresContext); diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.h b/mozilla/layout/xul/base/src/nsSliderFrame.h index c09254f2dd1..4ae99a0830e 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.h +++ b/mozilla/layout/xul/base/src/nsSliderFrame.h @@ -161,6 +161,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); virtual nsresult CurrentPositionChanged(nsIPresContext* aPresContext); diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index 5614751eec6..1b36815cb42 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -366,10 +366,11 @@ nsSplitterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); // if the alignment changed. Let the grippy know if (aAttribute == nsHTMLAtoms::align) { // tell the slider its attribute changed so it can @@ -377,7 +378,7 @@ nsSplitterFrame::AttributeChanged(nsIPresContext* aPresContext, nsIFrame* grippy = nsnull; nsScrollbarButtonFrame::GetChildWithTag(aPresContext, nsXULAtoms::grippy, this, grippy); if (grippy) - grippy->AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + grippy->AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } 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 64f2b9227d1..6c6c31bf17e 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.h +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.h @@ -54,6 +54,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD Init(nsIPresContext* aPresContext, diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp index 5fc763803d4..54ad2b6e5c6 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp @@ -100,6 +100,7 @@ nsTextBoxFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { mState |= NS_STATE_NEED_LAYOUT; diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.h b/mozilla/layout/xul/base/src/nsTextBoxFrame.h index 6ed819be0b7..5203da6d82d 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.h +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.h @@ -52,6 +52,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD GetFrameName(nsString& aResult) const; diff --git a/mozilla/layout/xul/base/src/nsXULTreeFrame.cpp b/mozilla/layout/xul/base/src/nsXULTreeFrame.cpp index 089f78f2292..5f84071133b 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeFrame.cpp +++ b/mozilla/layout/xul/base/src/nsXULTreeFrame.cpp @@ -347,7 +347,7 @@ nsXULTreeFrame::GetTreeBody(nsXULTreeOuterGroupFrame** aResult) NS_IMETHODIMP nsXULTreeFrame::AttributeChanged (nsIPresContext* aPresContext, nsIContent* aChild, - PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType, PRInt32 aHint) { if (aAttribute == nsXULAtoms::rows) { nsXULTreeOuterGroupFrame* treeOuterGroup = nsnull; @@ -378,5 +378,5 @@ nsXULTreeFrame::AttributeChanged (nsIPresContext* aPresContext, nsIContent* aChi return NS_OK; } else - return nsBoxFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aHint); + return nsBoxFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint); } diff --git a/mozilla/layout/xul/base/src/nsXULTreeFrame.h b/mozilla/layout/xul/base/src/nsXULTreeFrame.h index 75658ac2063..0cf9e1d0b03 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeFrame.h +++ b/mozilla/layout/xul/base/src/nsXULTreeFrame.h @@ -53,7 +53,7 @@ public: NS_IMETHOD BeginBatch(); NS_IMETHOD EndBatch(); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, - PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHinta); + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType, PRInt32 aHint); protected: nsXULTreeFrame(nsIPresShell* aPresShell, PRBool aIsRoot = nsnull, nsIBoxLayout* aLayoutManager = nsnull); diff --git a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp index 22863962df6..da57d8a9294 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp @@ -717,8 +717,9 @@ nsXULTreeGroupFrame :: ForceDrawFrame(nsIPresContext* aPresContext, nsIFrame * a // coordinate of where the drop feedback bar should be drawn. // NS_IMETHODIMP -nsXULTreeGroupFrame :: AttributeChanged ( nsIPresContext* aPresContext, nsIContent* aChild, - PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) +nsXULTreeGroupFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, + PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = NS_OK; PRInt32 ignore; @@ -741,7 +742,7 @@ nsXULTreeGroupFrame :: AttributeChanged ( nsIPresContext* aPresContext, nsIConte mDropOnContainer = attribute.EqualsWithConversion("true"); } else - rv = nsBoxFrame::AttributeChanged ( aPresContext, aChild, aNameSpaceID, aAttribute, aHint ); + rv = nsBoxFrame::AttributeChanged ( aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint ); return rv; diff --git a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.h b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.h index 6235c9014a0..a4ab5ccde9b 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.h +++ b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.h @@ -64,7 +64,7 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, - PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) ; + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType, PRInt32 aHint) ; nsXULTreeOuterGroupFrame* GetOuterFrame() { return mOuterFrame; }; nsIBox* GetFirstTreeBox(PRBool* aCreated = nsnull); diff --git a/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp b/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp index 8e30f212a70..49ef2aca6df 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp @@ -1476,7 +1476,8 @@ nsXULTreeOuterGroupFrame :: Paint ( nsIPresContext* aPresContext, nsIRenderingCo // NS_IMETHODIMP nsXULTreeOuterGroupFrame :: AttributeChanged ( nsIPresContext* aPresContext, nsIContent* aChild, - PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) + PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = NS_OK; @@ -1488,7 +1489,7 @@ nsXULTreeOuterGroupFrame :: AttributeChanged ( nsIPresContext* aPresContext, nsI mTreeIsSorted = PR_FALSE; } else - rv = nsXULTreeGroupFrame::AttributeChanged ( aPresContext, aChild, aNameSpaceID, aAttribute, aHint ); + rv = nsXULTreeGroupFrame::AttributeChanged ( aPresContext, aChild, aNameSpaceID, aAttribute, aModType, aHint ); return rv; diff --git a/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.h b/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.h index 71773a4b1cb..1352b15630f 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.h +++ b/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.h @@ -115,7 +115,7 @@ public: NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, - PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aHint) ; + PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aModType, PRInt32 aHint) ; NS_IMETHOD IsOutermostFrame(PRBool *aResult) { *aResult = PR_TRUE; return NS_OK; }; diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerColFrame.cpp b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerColFrame.cpp index acdf832ea0e..1e38177ed55 100644 --- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerColFrame.cpp +++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerColFrame.cpp @@ -154,10 +154,11 @@ nsOutlinerColFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (aAttribute == nsHTMLAtoms::width || aAttribute == nsHTMLAtoms::hidden) { // Invalidate the outliner. diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerColFrame.h b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerColFrame.h index 90cf93415c3..7bbe9ef59b6 100644 --- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerColFrame.h +++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerColFrame.h @@ -49,6 +49,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp index acdf832ea0e..1e38177ed55 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.cpp @@ -154,10 +154,11 @@ nsOutlinerColFrame::AttributeChanged(nsIPresContext* aPresContext, nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, - aNameSpaceID, aAttribute, aHint); + aNameSpaceID, aAttribute, aModType, aHint); if (aAttribute == nsHTMLAtoms::width || aAttribute == nsHTMLAtoms::hidden) { // Invalidate the outliner. diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h index 90cf93415c3..7bbe9ef59b6 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeColFrame.h @@ -49,6 +49,7 @@ public: nsIContent* aChild, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 2220ff16454..424ab378794 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -1522,6 +1522,7 @@ nsWebShellWindow::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint) { #if 0 diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.h b/mozilla/xpfe/appshell/src/nsWebShellWindow.h index 5d4edac9f40..bc4edcc92d5 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.h +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.h @@ -115,6 +115,7 @@ public: nsIContent* aContent, PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRInt32 aModType, PRInt32 aHint); NS_IMETHOD ContentAppended(nsIDocument *aDocument, nsIContent* aContainer,