mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 270708 remove nsPresContext variable from AttributeChanged and cleaned up comment in nsIFrame.h 

p=bugmail@q1n.org r=pkwarren sr=bzbarsky
This commit is contained in:
bugzilla%arlen.demon.co.uk 2004-12-31 01:13:27 +00:00
Родитель b02aed565c
Коммит c2ea7ec445
77 изменённых файлов: 199 добавлений и 284 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -10323,9 +10323,8 @@ nsCSSFrameConstructor::AttributeChanged(nsPresContext* aPresContext,
// let the frame deal with it now, so we don't have to deal later
if (primaryFrame) {
result = primaryFrame->AttributeChanged(aPresContext, aContent,
aNameSpaceID, aAttribute,
aModType);
result = primaryFrame->AttributeChanged(aContent, aNameSpaceID,
aAttribute, aModType);
// XXXwaterson should probably check for special IB siblings
// here, and propagate the AttributeChanged notification to
// them, as well. Currently, inline frames don't do anything on

2
layout/base/nsCSSFrameConstructor.h
Просмотреть файл

@ -127,7 +127,7 @@ public:
void GeneratedContentFrameRemoved(nsIFrame* aFrame);
nsresult AttributeChanged(nsPresContext* aPresContext,
nsresult AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,

11
layout/forms/nsFileControlFrame.cpp
Просмотреть файл

@ -548,11 +548,10 @@ nsFileControlFrame::SyncAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
}
NS_IMETHODIMP
nsFileControlFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
nsFileControlFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
// propagate disabled to text / button inputs
if (aNameSpaceID == kNameSpaceID_None &&
@ -564,7 +563,7 @@ nsFileControlFrame::AttributeChanged(nsPresContext* aPresContext,
SyncAttr(aNameSpaceID, aAttribute, SYNC_TEXT);
}
return nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType);
return nsAreaFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType);
}
NS_IMETHODIMP

3
layout/forms/nsFileControlFrame.h
Просмотреть файл

@ -98,8 +98,7 @@ public:
#endif
NS_IMETHOD SetSuggestedSize(nscoord aWidth, nscoord aHeight) { return NS_OK; };
NS_IMETHOD GetFrameForPoint(nsPresContext* aPresContext, const nsPoint& aPoint, nsFramePaintLayer aWhichLayer, nsIFrame** aFrame);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

11
layout/forms/nsGfxButtonControlFrame.cpp
Просмотреть файл

@ -307,11 +307,10 @@ nsGfxButtonControlFrame::GetDefaultLabel(nsString& aString)
}
NS_IMETHODIMP
nsGfxButtonControlFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
nsGfxButtonControlFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = NS_OK;
@ -329,7 +328,7 @@ nsGfxButtonControlFrame::AttributeChanged(nsPresContext* aPresContext,
// defer to HTMLButtonControlFrame
} else {
rv = nsHTMLButtonControlFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType);
rv = nsHTMLButtonControlFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType);
}
return rv;
}

3
layout/forms/nsGfxButtonControlFrame.h
Просмотреть файл

@ -95,8 +95,7 @@ public:
nsIContent * aContent,
nsIFrame** aFrame);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

11
layout/forms/nsIsIndexFrame.cpp
Просмотреть файл

@ -325,17 +325,16 @@ NS_IMETHODIMP nsIsIndexFrame::Reflow(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsIsIndexFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
nsIsIndexFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = NS_OK;
if (nsHTMLAtoms::prompt == aAttribute) {
rv = UpdatePromptLabel();
} else {
rv = nsAreaFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType);
rv = nsAreaFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType);
}
return rv;
}

3
layout/forms/nsIsIndexFrame.h
Просмотреть файл

@ -111,8 +111,7 @@ public:
#ifdef NS_DEBUG
NS_IMETHOD GetFrameName(nsAString& aResult) const;
#endif
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

19
layout/forms/nsTextControlFrame.cpp
Просмотреть файл

@ -2764,11 +2764,10 @@ nsTextControlFrame::GetSelectionContr(nsISelectionController **aSelCon)
////NSIFRAME
NS_IMETHODIMP
nsTextControlFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
nsTextControlFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
if (!mEditor || !mSelCon) {return NS_ERROR_NOT_INITIALIZED;}
nsresult rv = NS_OK;
@ -2799,14 +2798,14 @@ nsTextControlFrame::AttributeChanged(nsPresContext* aPresContext,
if (NS_CONTENT_ATTR_NOT_THERE != rv)
{ // set readonly
flags |= nsIPlaintextEditor::eEditorReadonlyMask;
if (mSelCon && IsFocusedContent(aPresContext, mContent))
if (mSelCon && IsFocusedContent(GetPresContext(), mContent))
mSelCon->SetCaretEnabled(PR_FALSE);
}
else
{ // unset readonly
flags &= ~(nsIPlaintextEditor::eEditorReadonlyMask);
if (mSelCon && !(flags & nsIPlaintextEditor::eEditorDisabledMask) &&
IsFocusedContent(aPresContext, mContent))
IsFocusedContent(GetPresContext(), mContent))
mSelCon->SetCaretEnabled(PR_TRUE);
}
mEditor->SetFlags(flags);
@ -2815,7 +2814,7 @@ nsTextControlFrame::AttributeChanged(nsPresContext* aPresContext,
{
// XXXbryner do we need to check for a null presshell here?
// we don't do anything with it.
nsIPresShell *shell = aPresContext->GetPresShell();
nsIPresShell *shell = GetPresContext()->GetPresShell();
if (!shell)
return NS_ERROR_FAILURE;
@ -2828,7 +2827,7 @@ nsTextControlFrame::AttributeChanged(nsPresContext* aPresContext,
if (mSelCon)
{
mSelCon->SetDisplaySelection(nsISelectionController::SELECTION_OFF);
if (IsFocusedContent(aPresContext, mContent))
if (IsFocusedContent(GetPresContext(), mContent))
mSelCon->SetCaretEnabled(PR_FALSE);
}
}
@ -2845,7 +2844,7 @@ nsTextControlFrame::AttributeChanged(nsPresContext* aPresContext,
// Allow the base class to handle common attributes supported
// by all form elements...
else {
rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType);
rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType);
}
return rv;

3
layout/forms/nsTextControlFrame.h
Просмотреть файл

@ -173,8 +173,7 @@ public:
virtual nsIAtom* GetType() const;
/** handler for attribute changes to mContent */
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

10
layout/generic/nsAreaFrame.cpp
Просмотреть файл

@ -156,20 +156,18 @@ nsAreaFrame::Destroy(nsPresContext* aPresContext)
}
NS_IMETHODIMP
nsAreaFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsAreaFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBlockFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBlockFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
// If the accesskey changed, register for the new value
// The old value has been unregistered in nsXULElement::SetAttr
if (aAttribute == nsXULAtoms::accesskey || aAttribute == nsXULAtoms::control)
RegUnregAccessKey(aPresContext, PR_TRUE);
RegUnregAccessKey(GetPresContext(), PR_TRUE);
return rv;
}

3
layout/generic/nsAreaFrame.h
Просмотреть файл

@ -67,8 +67,7 @@ public:
NS_IMETHOD Destroy(nsPresContext* aPresContext);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

19
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -2964,22 +2964,22 @@ nsBlockFrame::SlideLine(nsBlockReflowState& aState,
}
NS_IMETHODIMP
nsBlockFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsBlockFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBlockFrameSuper::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBlockFrameSuper::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if (NS_FAILED(rv)) {
return rv;
}
if (nsHTMLAtoms::start == aAttribute) {
nsPresContext* presContext = GetPresContext();
// XXX Not sure if this is necessary anymore
RenumberLists(aPresContext);
RenumberLists(presContext);
nsHTMLReflowCommand* reflowCmd;
rv = NS_NewHTMLReflowCommand(&reflowCmd, this,
@ -2987,7 +2987,7 @@ nsBlockFrame::AttributeChanged(nsPresContext* aPresContext,
nsnull,
aAttribute);
if (NS_SUCCEEDED(rv))
aPresContext->PresShell()->AppendReflowCommand(reflowCmd);
presContext->PresShell()->AppendReflowCommand(reflowCmd);
}
else if (nsHTMLAtoms::value == aAttribute) {
const nsStyleDisplay* styleDisplay = GetStyleDisplay();
@ -3010,8 +3010,9 @@ nsBlockFrame::AttributeChanged(nsPresContext* aPresContext,
// Tell the enclosing block frame to renumber list items within
// itself
if (nsnull != blockParent) {
nsPresContext* presContext = GetPresContext();
// XXX Not sure if this is necessary anymore
blockParent->RenumberLists(aPresContext);
blockParent->RenumberLists(presContext);
nsHTMLReflowCommand* reflowCmd;
rv = NS_NewHTMLReflowCommand(&reflowCmd, blockParent,
@ -3019,7 +3020,7 @@ nsBlockFrame::AttributeChanged(nsPresContext* aPresContext,
nsnull,
aAttribute);
if (NS_SUCCEEDED(rv))
aPresContext->PresShell()->AppendReflowCommand(reflowCmd);
presContext->PresShell()->AppendReflowCommand(reflowCmd);
}
}
}

3
layout/generic/nsBlockFrame.h
Просмотреть файл

@ -205,8 +205,7 @@ public:
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

3
layout/generic/nsFrame.cpp
Просмотреть файл

@ -2163,8 +2163,7 @@ nsFrame::CharacterDataChanged(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)

3
layout/generic/nsFrame.h
Просмотреть файл

@ -232,8 +232,7 @@ public:
NS_IMETHOD CharacterDataChanged(nsPresContext* aPresContext,
nsIContent* aChild,
PRBool aAppend);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

8
layout/generic/nsFrameFrame.cpp
Просмотреть файл

@ -125,8 +125,7 @@ public:
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);
@ -445,8 +444,7 @@ nsSubDocumentFrame::VerifyTree() const
}
NS_IMETHODIMP
nsSubDocumentFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsSubDocumentFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -493,7 +491,7 @@ nsSubDocumentFrame::AttributeChanged(nsPresContext* aPresContext,
// If our container is a web-shell, inform it that it has a new
// child. If it's not a web-shell then some things will not operate
// properly.
nsCOMPtr<nsISupports> container = aPresContext->GetContainer();
nsCOMPtr<nsISupports> container = GetPresContext()->GetContainer();
nsCOMPtr<nsIDocShellTreeNode> parentAsNode(do_QueryInterface(container));
if (parentAsNode) {

11
layout/generic/nsIFrame.h
Просмотреть файл

@ -829,12 +829,13 @@ public:
* The first frame that maps that content is asked to deal
* with the change by doing whatever is appropriate.
*
* @param aChild the content object
* @param aAttribute the attribute whose value changed
* @param aHint the level of change that has already been dealt with
* @param aChild the piece of content whose attribute changed
* @param aNameSpaceID the namespace of the attribute
* @param aAttribute the atom name of the attribute
* @param aModType Whether or not the attribute was added, changed, or removed.
* The constants are defined in nsIDOMMutationEvent.h.
*/
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType) = 0;

10
layout/generic/nsImageFrame.cpp
Просмотреть файл

@ -1758,22 +1758,20 @@ nsImageFrame::GetCursor(const nsPoint& aPoint,
}
NS_IMETHODIMP
nsImageFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsImageFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsSplittableFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsSplittableFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if (NS_FAILED(rv)) {
return rv;
}
if (nsHTMLAtoms::alt == aAttribute)
{
mState |= NS_FRAME_IS_DIRTY;
mParent->ReflowDirtyChild(aPresContext->PresShell(), (nsIFrame*) this);
mParent->ReflowDirtyChild(GetPresContext()->PresShell(), (nsIFrame*) this);
}
return NS_OK;

3
layout/generic/nsImageFrame.h
Просмотреть файл

@ -115,8 +115,7 @@ public:
nsEventStatus* aEventStatus);
NS_IMETHOD GetCursor(const nsPoint& aPoint,
nsIFrame::Cursor& aCursor);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

5
layout/mathml/base/src/nsMathMLContainerFrame.cpp
Просмотреть файл

@ -1017,8 +1017,7 @@ nsMathMLContainerFrame::ReplaceFrame(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsMathMLContainerFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsMathMLContainerFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -1033,7 +1032,7 @@ nsMathMLContainerFrame::AttributeChanged(nsPresContext* aPresContext,
MapAttributesIntoCSS(aPresContext, this);
}
return ReflowDirtyChild(aPresContext->PresShell(), nsnull);
return ReflowDirtyChild(GetPresContext()->PresShell(), nsnull);
}
// We are an inline frame, so we handle dirty request like nsInlineFrame

3
layout/mathml/base/src/nsMathMLContainerFrame.h
Просмотреть файл

@ -204,8 +204,7 @@ public:
// Therefore, there is an overhead here in that our siblings are re-laid
// too (e.g., this happens with <mstyle>, <munder>, <mover>, <munderover>).
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

5
layout/mathml/base/src/nsMathMLTokenFrame.cpp
Просмотреть файл

@ -269,8 +269,7 @@ nsMathMLTokenFrame::ReflowDirtyChild(nsIPresShell* aPresShell,
}
NS_IMETHODIMP
nsMathMLTokenFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
nsMathMLTokenFrame::AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -281,7 +280,7 @@ nsMathMLTokenFrame::AttributeChanged(nsPresContext* aPresContext,
}
return nsMathMLContainerFrame::
AttributeChanged(aPresContext, aContent, aNameSpaceID,
AttributeChanged(aContent, aNameSpaceID,
aAttribute, aModType);
}

3
layout/mathml/base/src/nsMathMLTokenFrame.h
Просмотреть файл

@ -80,8 +80,7 @@ public:
nsIFrame* aChild);
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

7
layout/mathml/base/src/nsMathMLmfencedFrame.cpp
Просмотреть файл

@ -105,17 +105,16 @@ nsMathMLmfencedFrame::SetInitialChildList(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsMathMLmfencedFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
nsMathMLmfencedFrame::AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
RemoveFencesAndSeparators();
CreateFencesAndSeparators(aPresContext);
CreateFencesAndSeparators(GetPresContext());
return nsMathMLContainerFrame::
AttributeChanged(aPresContext, aContent, aNameSpaceID,
AttributeChanged(aContent, aNameSpaceID,
aAttribute, aModType);
}

3
layout/mathml/base/src/nsMathMLmfencedFrame.h
Просмотреть файл

@ -79,8 +79,7 @@ public:
PRUint32 aFlags = 0);
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

10
layout/mathml/base/src/nsMathMLmfracFrame.cpp
Просмотреть файл

@ -453,8 +453,7 @@ nsMathMLmfracFrame::Place(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsMathMLmfracFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
nsMathMLmfracFrame::AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -472,15 +471,16 @@ nsMathMLmfracFrame::AttributeChanged(nsPresContext* aPresContext,
if (!mSlashChar) {
mSlashChar = new nsMathMLChar();
if (mSlashChar) {
nsPresContext* presContext = GetPresContext();
nsAutoString slashChar; slashChar.Assign(kSlashChar);
mSlashChar->SetData(aPresContext, slashChar);
ResolveMathMLCharStyle(aPresContext, mContent, mStyleContext, mSlashChar, PR_TRUE);
mSlashChar->SetData(presContext, slashChar);
ResolveMathMLCharStyle(presContext, mContent, mStyleContext, mSlashChar, PR_TRUE);
}
}
}
}
return nsMathMLContainerFrame::
AttributeChanged(aPresContext, aContent,aNameSpaceID,
AttributeChanged(aContent, aNameSpaceID,
aAttribute, aModType);
}

3
layout/mathml/base/src/nsMathMLmfracFrame.h
Просмотреть файл

@ -94,8 +94,7 @@ public:
GetAdditionalStyleContext(PRInt32 aIndex) const;
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

7
layout/mathml/base/src/nsMathMLmoFrame.cpp
Просмотреть файл

@ -988,8 +988,7 @@ nsMathMLmoFrame::ReflowDirtyChild(nsIPresShell* aPresShell,
}
NS_IMETHODIMP
nsMathMLmoFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
nsMathMLmoFrame::AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -1009,11 +1008,11 @@ nsMathMLmoFrame::AttributeChanged(nsPresContext* aPresContext,
} while (embellishData.coreFrame == this);
// we have automatic data to update in the children of the target frame
return ReLayoutChildren(aPresContext, target);
return ReLayoutChildren(GetPresContext(), target);
}
return nsMathMLTokenFrame::
AttributeChanged(aPresContext, aContent, aNameSpaceID,
AttributeChanged(aContent, aNameSpaceID,
aAttribute, aModType);
}

3
layout/mathml/base/src/nsMathMLmoFrame.h
Просмотреть файл

@ -84,8 +84,7 @@ public:
nsIFrame* aChild);
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

7
layout/mathml/base/src/nsMathMLmoverFrame.cpp
Просмотреть файл

@ -80,8 +80,7 @@ nsMathMLmoverFrame::~nsMathMLmoverFrame()
}
NS_IMETHODIMP
nsMathMLmoverFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
nsMathMLmoverFrame::AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -89,11 +88,11 @@ nsMathMLmoverFrame::AttributeChanged(nsPresContext* aPresContext,
if (nsMathMLAtoms::accent_ == aAttribute) {
// When we have automatic data to update within ourselves, we ask our
// parent to re-layout its children
return ReLayoutChildren(aPresContext, mParent);
return ReLayoutChildren(GetPresContext(), mParent);
}
return nsMathMLContainerFrame::
AttributeChanged(aPresContext, aContent, aNameSpaceID,
AttributeChanged(aContent, aNameSpaceID,
aAttribute, aModType);
}

3
layout/mathml/base/src/nsMathMLmoverFrame.h
Просмотреть файл

@ -79,8 +79,7 @@ public:
PRUint32 aFlagsToUpdate);
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

5
layout/mathml/base/src/nsMathMLmstyleFrame.cpp
Просмотреть файл

@ -206,8 +206,7 @@ nsMathMLmstyleFrame::UpdatePresentationDataFromChildAt(nsPresContext* aPresConte
}
NS_IMETHODIMP
nsMathMLmstyleFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
nsMathMLmstyleFrame::AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -217,5 +216,5 @@ nsMathMLmstyleFrame::AttributeChanged(nsPresContext* aPresContext,
// them in our subtree. However, our siblings will be re-laid too. We used
// to have a more speedier but more verbose alternative that didn't re-layout
// our siblings. See bug 114909 - attachment 67668.
return ReLayoutChildren(aPresContext, mParent);
return ReLayoutChildren(GetPresContext(), mParent);
}

3
layout/mathml/base/src/nsMathMLmstyleFrame.h
Просмотреть файл

@ -51,8 +51,7 @@ public:
friend nsresult NS_NewMathMLmstyleFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame);
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

7
layout/mathml/base/src/nsMathMLmunderFrame.cpp
Просмотреть файл

@ -80,8 +80,7 @@ nsMathMLmunderFrame::~nsMathMLmunderFrame()
}
NS_IMETHODIMP
nsMathMLmunderFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
nsMathMLmunderFrame::AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -89,11 +88,11 @@ nsMathMLmunderFrame::AttributeChanged(nsPresContext* aPresContext,
if (nsMathMLAtoms::accentunder_ == aAttribute) {
// When we have automatic data to update within ourselves, we ask our
// parent to re-layout its children
return ReLayoutChildren(aPresContext, mParent);
return ReLayoutChildren(GetPresContext(), mParent);
}
return nsMathMLContainerFrame::
AttributeChanged(aPresContext, aContent, aNameSpaceID,
AttributeChanged(aContent, aNameSpaceID,
aAttribute, aModType);
}

3
layout/mathml/base/src/nsMathMLmunderFrame.h
Просмотреть файл

@ -79,8 +79,7 @@ public:
PRUint32 aFlagsToUpdate);
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

7
layout/mathml/base/src/nsMathMLmunderoverFrame.cpp
Просмотреть файл

@ -80,8 +80,7 @@ nsMathMLmunderoverFrame::~nsMathMLmunderoverFrame()
}
NS_IMETHODIMP
nsMathMLmunderoverFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aContent,
nsMathMLmunderoverFrame::AttributeChanged(nsIContent* aContent,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -90,11 +89,11 @@ nsMathMLmunderoverFrame::AttributeChanged(nsPresContext* aPresContext,
nsMathMLAtoms::accentunder_ == aAttribute) {
// When we have automatic data to update within ourselves, we ask our
// parent to re-layout its children
return ReLayoutChildren(aPresContext, mParent);
return ReLayoutChildren(GetPresContext(), mParent);
}
return nsMathMLContainerFrame::
AttributeChanged(aPresContext, aContent, aNameSpaceID,
AttributeChanged(aContent, aNameSpaceID,
aAttribute, aModType);
}

3
layout/mathml/base/src/nsMathMLmunderoverFrame.h
Просмотреть файл

@ -79,8 +79,7 @@ public:
PRUint32 aFlagsToUpdate);
NS_IMETHOD
AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

3
layout/svg/base/src/nsSVGGenericContainerFrame.cpp
Просмотреть файл

@ -180,8 +180,7 @@ nsSVGGenericContainerFrame::ReplaceFrame(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsSVGGenericContainerFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsSVGGenericContainerFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)

3
layout/svg/base/src/nsSVGGenericContainerFrame.h
Просмотреть файл

@ -92,8 +92,7 @@ public:
nsStyleContext* aContext,
nsIFrame* aPrevInFlow);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

6
layout/svg/base/src/nsSVGInnerSVGFrame.cpp
Просмотреть файл

@ -102,8 +102,7 @@ public:
nsStyleContext* aContext,
nsIFrame* aPrevInFlow);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);
@ -329,8 +328,7 @@ nsSVGInnerSVGFrame::ReplaceFrame(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsSVGInnerSVGFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsSVGInnerSVGFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)

6
layout/svg/base/src/nsSVGOuterSVGFrame.cpp
Просмотреть файл

@ -205,8 +205,7 @@ public:
nsIFrame* aOldFrame,
nsIFrame* aNewFrame);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);
@ -692,8 +691,7 @@ nsSVGOuterSVGFrame::ReplaceFrame(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsSVGOuterSVGFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsSVGOuterSVGFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)

3
layout/svg/base/src/nsSVGPathGeometryFrame.cpp
Просмотреть файл

@ -119,8 +119,7 @@ nsSVGPathGeometryFrame::Init(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsSVGPathGeometryFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsSVGPathGeometryFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType,

3
layout/svg/base/src/nsSVGPathGeometryFrame.h
Просмотреть файл

@ -79,8 +79,7 @@ public:
nsStyleContext* aContext,
nsIFrame* aPrevInFlow);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType,

8
layout/svg/base/src/nsSVGTextFrame.cpp
Просмотреть файл

@ -115,8 +115,7 @@ public:
nsStyleContext* aContext,
nsIFrame* aPrevInFlow);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType,
@ -281,7 +280,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsSVGTextFrameBase)
//----------------------------------------------------------------------
// nsIFrame methods
NS_IMETHODIMP
nsSVGTextFrame::Init(nsPresContext* aPresContext,
nsSVGTextFrame::Init(nsPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsStyleContext* aContext,
@ -297,8 +296,7 @@ nsSVGTextFrame::Init(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsSVGTextFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsSVGTextFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType,

5
layout/tables/nsTableCellFrame.cpp
Просмотреть файл

@ -205,8 +205,7 @@ nsTableCellFrame::GetColIndex(PRInt32 &aColIndex) const
}
NS_IMETHODIMP
nsTableCellFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsTableCellFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -215,7 +214,7 @@ nsTableCellFrame::AttributeChanged(nsPresContext* aPresContext,
nsTableFrame* tableFrame = nsnull;
nsresult rv = nsTableFrame::GetTableFrame(this, tableFrame);
if ((NS_SUCCEEDED(rv)) && (tableFrame)) {
tableFrame->AttributeChangedFor(aPresContext, this, aChild, aAttribute);
tableFrame->AttributeChangedFor(GetPresContext(), this, aChild, aAttribute);
}
return NS_OK;
}

3
layout/tables/nsTableCellFrame.h
Просмотреть файл

@ -93,8 +93,7 @@ public:
#endif
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

14
layout/xul/base/src/nsBoxFrame.cpp
Просмотреть файл

@ -1232,15 +1232,13 @@ nsBoxFrame::AppendFrames(nsPresContext* aPresContext,
NS_IMETHODIMP
nsBoxFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsBoxFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsContainerFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsContainerFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
// Ignore 'width', 'height', 'screenX', 'screenY' and 'sizemode' on a
// <window>.
@ -1336,11 +1334,11 @@ nsBoxFrame::AttributeChanged(nsPresContext* aPresContext,
UpdateMouseThrough();
}
nsBoxLayoutState state(aPresContext);
nsBoxLayoutState state(GetPresContext());
MarkDirty(state);
}
else if (aAttribute == nsXULAtoms::ordinal) {
nsBoxLayoutState state(aPresContext->PresShell());
nsBoxLayoutState state(GetPresContext()->PresShell());
nsIBox* parent;
GetParentBox(&parent);
@ -1350,7 +1348,7 @@ nsBoxFrame::AttributeChanged(nsPresContext* aPresContext,
// If the accesskey changed, register for the new value
// The old value has been unregistered in nsXULElement::SetAttr
else if (aAttribute == nsXULAtoms::accesskey) {
RegUnregAccessKey(aPresContext, PR_TRUE);
RegUnregAccessKey(GetPresContext(), PR_TRUE);
}
return rv;

3
layout/xul/base/src/nsBoxFrame.h
Просмотреть файл

@ -141,8 +141,7 @@ public:
nsIFrame* asPrevInFlow);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

10
layout/xul/base/src/nsDeckFrame.cpp
Просмотреть файл

@ -100,20 +100,18 @@ nsDeckFrame::ChildrenMustHaveWidgets(PRBool& aMust) const
}
NS_IMETHODIMP
nsDeckFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsDeckFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
// if the index changed hide the old element and make the now element visible
if (aAttribute == nsXULAtoms::selectedIndex) {
IndexChanged(aPresContext);
IndexChanged(GetPresContext());
}
return rv;

3
layout/xul/base/src/nsDeckFrame.h
Просмотреть файл

@ -56,8 +56,7 @@ public:
nsIFrame** aNewFrame,
nsIBoxLayout* aLayoutManager);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

14
layout/xul/base/src/nsImageBoxFrame.cpp
Просмотреть файл

@ -245,17 +245,17 @@ NS_NewImageBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame )
} // NS_NewTitledButtonFrame
NS_IMETHODIMP
nsImageBoxFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
nsImageBoxFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsLeafBoxFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType);
nsresult rv = nsLeafBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if (aAttribute == nsHTMLAtoms::src) {
UpdateImage();
nsBoxLayoutState state(aPresContext);
nsBoxLayoutState state(GetPresContext());
MarkDirty(state);
}
else if (aAttribute == nsXULAtoms::validate)

3
layout/xul/base/src/nsImageBoxFrame.h
Просмотреть файл

@ -82,8 +82,7 @@ public:
nsStyleContext* aContext,
nsIFrame* asPrevInFlow);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

8
layout/xul/base/src/nsLeafBoxFrame.cpp
Просмотреть файл

@ -131,15 +131,13 @@ nsLeafBoxFrame::Init(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsLeafBoxFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsLeafBoxFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsLeafFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsLeafFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if (aAttribute == nsXULAtoms::mousethrough)
UpdateMouseThrough();

3
layout/xul/base/src/nsLeafBoxFrame.h
Просмотреть файл

@ -87,8 +87,7 @@ public:
nsFramePaintLayer aWhichLayer,
nsIFrame** aFrame);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

10
layout/xul/base/src/nsListBoxBodyFrame.cpp
Просмотреть файл

@ -303,8 +303,7 @@ nsListBoxBodyFrame::Destroy(nsPresContext* aPresContext)
}
NS_IMETHODIMP
nsListBoxBodyFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsListBoxBodyFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -318,20 +317,21 @@ nsListBoxBodyFrame::AttributeChanged(nsPresContext* aPresContext,
if (!rows.IsEmpty()) {
PRInt32 dummy;
PRInt32 count = rows.ToInteger(&dummy);
nsPresContext* presContext = GetPresContext();
float t2p;
t2p = aPresContext->TwipsToPixels();
t2p = presContext->TwipsToPixels();
PRInt32 rowHeight = GetRowHeightTwips();
rowHeight = NSTwipsToIntPixels(rowHeight, t2p);
nsAutoString value;
value.AppendInt(rowHeight*count);
mContent->SetAttr(kNameSpaceID_None, nsXULAtoms::minheight, value, PR_FALSE);
nsBoxLayoutState state(aPresContext);
nsBoxLayoutState state(presContext);
MarkDirty(state);
}
}
else
rv = nsBoxFrame::AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType);
rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType);
return rv;

5
layout/xul/base/src/nsListBoxBodyFrame.h
Просмотреть файл

@ -77,9 +77,8 @@ public:
NS_IMETHOD Init(nsPresContext* aPresContext, nsIContent* aContent,
nsIFrame* aParent, nsStyleContext* aContext, nsIFrame* aPrevInFlow);
NS_IMETHOD Destroy(nsPresContext* aPresContext);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext, nsIContent* aChild,
PRInt32 aNameSpaceID, nsIAtom* aAttribute,
PRInt32 aModType);
NS_IMETHOD AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID,
nsIAtom* aAttribute, PRInt32 aModType);
// nsIScrollbarMediator
NS_IMETHOD PositionChanged(nsISupports* aScrollbar, PRInt32 aOldIndex, PRInt32& aNewIndex);

7
layout/xul/base/src/nsMenuFrame.cpp
Просмотреть файл

@ -674,8 +674,7 @@ nsMenuFrame::ActivateMenu(PRBool aActivateFlag)
}
NS_IMETHODIMP
nsMenuFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsMenuFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -692,7 +691,7 @@ nsMenuFrame::AttributeChanged(nsPresContext* aPresContext,
}
} else if (aAttribute == nsHTMLAtoms::checked) {
if (mType != eMenuType_Normal)
UpdateMenuSpecialState(aPresContext);
UpdateMenuSpecialState(GetPresContext());
} else if (aAttribute == nsXULAtoms::acceltext) {
// someone reset the accelText attribute, so clear the bit that says *we* set it
AddStateBits(NS_STATE_ACCELTEXT_IS_DERIVED);
@ -700,7 +699,7 @@ nsMenuFrame::AttributeChanged(nsPresContext* aPresContext,
} else if (aAttribute == nsXULAtoms::key) {
BuildAcceleratorText();
} else if ( aAttribute == nsHTMLAtoms::type || aAttribute == nsHTMLAtoms::name )
UpdateMenuType(aPresContext);
UpdateMenuType(GetPresContext());
return NS_OK;
}

3
layout/xul/base/src/nsMenuFrame.h
Просмотреть файл

@ -223,8 +223,7 @@ protected:
// Called as a hook just after the menu goes away.
PRBool OnDestroyed();
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

8
layout/xul/base/src/nsMenuPopupFrame.cpp
Просмотреть файл

@ -1999,16 +1999,14 @@ nsMenuPopupFrame::IsDisabled(nsIContent* aContent)
}
NS_IMETHODIMP
nsMenuPopupFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsMenuPopupFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if (aAttribute == nsXULAtoms::left || aAttribute == nsXULAtoms::top)
MoveToAttributePosition();

3
layout/xul/base/src/nsMenuPopupFrame.h
Просмотреть файл

@ -122,8 +122,7 @@ public:
nsStyleContext* aContext,
nsIFrame* aPrevInFlow);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

8
layout/xul/base/src/nsNativeScrollbarFrame.cpp
Просмотреть файл

@ -198,15 +198,13 @@ nsNativeScrollbarFrame::Reflow(nsPresContext* aPresContext,
// our native scrollbar with the correct values.
//
NS_IMETHODIMP
nsNativeScrollbarFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsNativeScrollbarFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if ( aAttribute == nsXULAtoms::curpos ||
aAttribute == nsXULAtoms::maxpos ||

5
layout/xul/base/src/nsNativeScrollbarFrame.h
Просмотреть файл

@ -75,9 +75,8 @@ public:
nsIFrame* aParent, nsStyleContext* aContext, nsIFrame* aPrevInFlow);
// nsIFrame overrides
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext, nsIContent* aChild,
PRInt32 aNameSpaceID, nsIAtom* aAttribute,
PRInt32 aModType);
NS_IMETHOD AttributeChanged(nsIContent* aChild, PRInt32 aNameSpaceID,
nsIAtom* aAttribute, PRInt32 aModType);
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }

12
layout/xul/base/src/nsProgressMeterFrame.cpp
Просмотреть файл

@ -98,20 +98,18 @@ nsProgressMeterFrame::SetInitialChildList(nsPresContext* aPresContext,
{
// Set up our initial flexes.
nsresult rv = nsBoxFrame::SetInitialChildList(aPresContext, aListName, aChildList);
AttributeChanged(aPresContext, mContent, kNameSpaceID_None, nsHTMLAtoms::value, 0);
AttributeChanged(mContent, kNameSpaceID_None, nsHTMLAtoms::value, 0);
return rv;
}
NS_IMETHODIMP
nsProgressMeterFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsProgressMeterFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if (NS_OK != rv) {
return rv;
}
@ -139,7 +137,7 @@ nsProgressMeterFrame::AttributeChanged(nsPresContext* aPresContext,
barChild->GetContent()->SetAttr(kNameSpaceID_None, nsXULAtoms::flex, leftFlex, PR_TRUE);
remainderChild->GetContent()->SetAttr(kNameSpaceID_None, nsXULAtoms::flex, rightFlex, PR_TRUE);
nsBoxLayoutState state(aPresContext);
nsBoxLayoutState state(GetPresContext());
MarkDirty(state);
}
return NS_OK;

3
layout/xul/base/src/nsProgressMeterFrame.h
Просмотреть файл

@ -62,8 +62,7 @@ public:
nsIAtom* aListName,
nsIFrame* aChildList);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

14
layout/xul/base/src/nsResizerFrame.cpp
Просмотреть файл

@ -329,15 +329,13 @@ nsResizerFrame::GetInitialDirection(eDirection& aDirection)
NS_IMETHODIMP
nsResizerFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
nsResizerFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsTitleBarFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsTitleBarFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if (aAttribute == nsXULAtoms::dir )
{

3
layout/xul/base/src/nsResizerFrame.h
Просмотреть файл

@ -72,8 +72,7 @@ public:
nsStyleContext* aContext,
nsIFrame* asPrevInFlow);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

8
layout/xul/base/src/nsScrollbarFrame.cpp
Просмотреть файл

@ -130,15 +130,13 @@ nsScrollbarFrame::IsContainingBlock() const
}
NS_IMETHODIMP
nsScrollbarFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsScrollbarFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
// if the current position changes, notify any nsGfxScrollFrame
// parent we may have

3
layout/xul/base/src/nsScrollbarFrame.h
Просмотреть файл

@ -63,8 +63,7 @@ public:
#endif
// nsIFrame overrides
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

18
layout/xul/base/src/nsSliderFrame.cpp
Просмотреть файл

@ -230,18 +230,16 @@ nsSliderFrame::GetIntegerAttribute(nsIContent* content, nsIAtom* atom, PRInt32 d
NS_IMETHODIMP
nsSliderFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
nsSliderFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
// if the current position changes
if (aAttribute == nsXULAtoms::curpos) {
rv = CurrentPositionChanged(aPresContext);
rv = CurrentPositionChanged(GetPresContext());
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to change position");
if (NS_FAILED(rv))
return rv;
@ -280,7 +278,7 @@ nsSliderFrame::AttributeChanged(nsPresContext* aPresContext,
aAttribute == nsXULAtoms::pageincrement ||
aAttribute == nsXULAtoms::increment) {
nsBoxLayoutState state(aPresContext);
nsBoxLayoutState state(GetPresContext());
MarkDirtyChildren(state);
}

3
layout/xul/base/src/nsSliderFrame.h
Просмотреть файл

@ -167,8 +167,7 @@ public:
nsFramePaintLayer aWhichLayer,
PRUint32 aFlags = 0);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

12
layout/xul/base/src/nsSplitterFrame.cpp
Просмотреть файл

@ -283,23 +283,21 @@ nsSplitterFrame::GetCursor(const nsPoint& aPoint,
}
NS_IMETHODIMP
nsSplitterFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsSplitterFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
// if the alignment changed. Let the grippy know
if (aAttribute == nsHTMLAtoms::align) {
// tell the slider its attribute changed so it can
// update itself
nsIFrame* grippy = nsnull;
nsScrollbarButtonFrame::GetChildWithTag(aPresContext, nsXULAtoms::grippy, this, grippy);
nsScrollbarButtonFrame::GetChildWithTag(GetPresContext(), nsXULAtoms::grippy, this, grippy);
if (grippy)
grippy->AttributeChanged(aPresContext, aChild, aNameSpaceID, aAttribute, aModType);
grippy->AttributeChanged(aChild, aNameSpaceID, aAttribute, aModType);
} else if (aAttribute == nsXULAtoms::state) {
mInner->UpdateState();
}

3
layout/xul/base/src/nsSplitterFrame.h
Просмотреть файл

@ -63,8 +63,7 @@ public:
#endif
// nsIFrame overrides
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

12
layout/xul/base/src/nsTextBoxFrame.cpp
Просмотреть файл

@ -120,8 +120,7 @@ NS_NewTextBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame )
NS_IMETHODIMP
nsTextBoxFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsTextBoxFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
@ -129,21 +128,22 @@ nsTextBoxFrame::AttributeChanged(nsPresContext* aPresContext,
mState |= NS_STATE_NEED_LAYOUT;
PRBool aResize;
PRBool aRedraw;
nsPresContext* presContext = GetPresContext();
UpdateAttributes(aPresContext, aAttribute, aResize, aRedraw);
UpdateAttributes(presContext, aAttribute, aResize, aRedraw);
if (aResize) {
nsBoxLayoutState state(aPresContext);
nsBoxLayoutState state(presContext);
MarkDirty(state);
} else if (aRedraw) {
nsBoxLayoutState state(aPresContext);
nsBoxLayoutState state(presContext);
Redraw(state);
}
// If the accesskey changed, register for the new value
// The old value has been unregistered in nsXULElement::SetAttr
if (aAttribute == nsXULAtoms::accesskey || aAttribute == nsXULAtoms::control)
RegUnregAccessKey(aPresContext, PR_TRUE);
RegUnregAccessKey(presContext, PR_TRUE);
return NS_OK;
}

3
layout/xul/base/src/nsTextBoxFrame.h
Просмотреть файл

@ -66,8 +66,7 @@ public:
NS_IMETHOD Destroy(nsPresContext* aPresContext);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);

8
layout/xul/base/src/tree/src/nsTreeColFrame.cpp
Просмотреть файл

@ -181,15 +181,13 @@ nsTreeColFrame::GetFrameForPoint(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsTreeColFrame::AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
nsTreeColFrame::AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType)
{
nsresult rv = nsBoxFrame::AttributeChanged(aPresContext, aChild,
aNameSpaceID, aAttribute,
aModType);
nsresult rv = nsBoxFrame::AttributeChanged(aChild, aNameSpaceID,
aAttribute, aModType);
if (aAttribute == nsXULAtoms::ordinal || aAttribute == nsXULAtoms::primary) {
EnsureColumns();

3
layout/xul/base/src/tree/src/nsTreeColFrame.h
Просмотреть файл

@ -63,8 +63,7 @@ public:
nsFramePaintLayer aWhichLayer,
nsIFrame** aFrame);
NS_IMETHOD AttributeChanged(nsPresContext* aPresContext,
nsIContent* aChild,
NS_IMETHOD AttributeChanged(nsIContent* aChild,
PRInt32 aNameSpaceID,
nsIAtom* aAttribute,
PRInt32 aModType);