Bug 328926. Remove aPresContext parameter from nsIFrame::Destroy, nsIFrame::SetInitialChildList and nsIFrame::RemovedAsPrimaryFrame. patch by Marc Liddell, r+sr=roc
git-svn-id: svn://10.0.0.236/trunk@193976 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -315,8 +315,8 @@ nsListControlFrame::~nsListControlFrame()
|
||||
}
|
||||
|
||||
// for Bug 47302 (remove this comment later)
|
||||
NS_IMETHODIMP
|
||||
nsListControlFrame::Destroy(nsPresContext *aPresContext)
|
||||
void
|
||||
nsListControlFrame::Destroy()
|
||||
{
|
||||
// get the receiver interface from the browser button's content node
|
||||
nsCOMPtr<nsIDOMEventReceiver> receiver(do_QueryInterface(mContent));
|
||||
@@ -338,8 +338,8 @@ nsListControlFrame::Destroy(nsPresContext *aPresContext)
|
||||
mEventListener),
|
||||
NS_GET_IID(nsIDOMKeyListener));
|
||||
|
||||
nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
|
||||
return nsHTMLScrollFrame::Destroy(aPresContext);
|
||||
nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
|
||||
nsHTMLScrollFrame::Destroy();
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
@@ -751,7 +751,7 @@ nsListControlFrame::Reflow(nsPresContext* aPresContext,
|
||||
|
||||
// Add the list frame as a child of the form
|
||||
if (eReflowReason_Initial == aReflowState.reason) {
|
||||
nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
|
||||
nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
|
||||
}
|
||||
|
||||
//--Calculate a width just big enough for the scrollframe to shrink around the
|
||||
@@ -1391,8 +1391,7 @@ nsListControlFrame::HandleEvent(nsPresContext* aPresContext,
|
||||
|
||||
//---------------------------------------------------------
|
||||
NS_IMETHODIMP
|
||||
nsListControlFrame::SetInitialChildList(nsPresContext* aPresContext,
|
||||
nsIAtom* aListName,
|
||||
nsListControlFrame::SetInitialChildList(nsIAtom* aListName,
|
||||
nsIFrame* aChildList)
|
||||
{
|
||||
// First check to see if all the content has been added
|
||||
@@ -1401,7 +1400,7 @@ nsListControlFrame::SetInitialChildList(nsPresContext* aPresContext,
|
||||
mIsAllFramesHere = PR_FALSE;
|
||||
mHasBeenInitialized = PR_FALSE;
|
||||
}
|
||||
nsresult rv = nsHTMLScrollFrame::SetInitialChildList(aPresContext, aListName, aChildList);
|
||||
nsresult rv = nsHTMLScrollFrame::SetInitialChildList(aListName, aChildList);
|
||||
|
||||
// If all the content is here now check
|
||||
// to see if all the frames have been created
|
||||
|
||||
Reference in New Issue
Block a user