Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 328926. Remove aPresContext parameter from nsIFrame::Destroy, nsIFrame::SetInitialChildList and nsIFrame::RemovedAsPrimaryFrame. patch by Marc Liddell, r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@193976 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2006-04-10 00:16:29 +00:00
parent 5a0aae6de3
commit b6ebd9961d
109 changed files with 548 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/layout/forms/nsFormControlFrame.cpp
View File

@@ -56,13 +56,13 @@ nsFormControlFrame::~nsFormControlFrame()
{
}
NS_IMETHODIMP
nsFormControlFrame::Destroy(nsPresContext *aPresContext)
void
nsFormControlFrame::Destroy()
{
// XXXldb Do we really need to do this? Shouldn't only those frames
// that use it do it?
nsFormControlFrame::RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
return nsLeafFrame::Destroy(aPresContext);
nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
nsLeafFrame::Destroy();
}
// Frames are not refcounted, no need to AddRef
@@ -263,8 +263,7 @@ nsFormControlFrame::DidReflow(nsPresContext* aPresContext,
}
NS_IMETHODIMP
nsFormControlFrame::SetInitialChildList(nsPresContext* aPresContext,
nsIAtom* aListName,
nsFormControlFrame::SetInitialChildList(nsIAtom* aListName,
nsIFrame* aChildList)
{
return NS_OK;
@@ -280,7 +279,7 @@ nsFormControlFrame::Reflow(nsPresContext* aPresContext,
DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
if (!mDidInit) {
RegUnRegAccessKey(aPresContext, NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
mDidInit = PR_TRUE;
}
@@ -294,17 +293,20 @@ nsFormControlFrame::Reflow(nsPresContext* aPresContext,
}
nsresult
nsFormControlFrame::RegUnRegAccessKey(nsPresContext* aPresContext, nsIFrame * aFrame, PRBool aDoReg)
nsFormControlFrame::RegUnRegAccessKey(nsIFrame * aFrame, PRBool aDoReg)
{
NS_ASSERTION(aPresContext, "aPresContext is NULL in RegUnRegAccessKey!");
NS_ENSURE_ARG_POINTER(aFrame);
nsPresContext* presContext = aFrame->GetPresContext();
NS_ASSERTION(presContext, "aPresContext is NULL in RegUnRegAccessKey!");
nsAutoString accessKey;
nsIContent* content = aFrame->GetContent();
content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::accesskey, accessKey);
if (!accessKey.IsEmpty()) {
nsIEventStateManager *stateManager = aPresContext->EventStateManager();
nsIEventStateManager *stateManager = presContext->EventStateManager();
if (aDoReg) {
return stateManager->RegisterAccessKey(content, (PRUint32)accessKey.First());
} else {