mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-26 23:23:33 +00:00
Renamed RemoveFrame to RemoveAFrame to reduce compiler warnings
This commit is contained in:
parent
a16334a322
commit
2a44cdd816
@ -550,7 +550,7 @@ nsContainerFrame::AddFrame(const nsHTMLReflowState& aReflowState,
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsContainerFrame::RemoveFrame(nsIFrame* aRemovedFrame)
|
||||
nsContainerFrame::RemoveAFrame(nsIFrame* aRemovedFrame)
|
||||
{
|
||||
PRBool zap = mFrames.RemoveFrame(aRemovedFrame);
|
||||
NS_ASSERTION(zap, "failure to remove a frame");
|
||||
|
@ -138,7 +138,7 @@ protected:
|
||||
|
||||
/**
|
||||
*/
|
||||
nsresult RemoveFrame(nsIFrame * aRemovedFrame);
|
||||
nsresult RemoveAFrame(nsIFrame* aRemovedFrame);
|
||||
|
||||
/**
|
||||
* Returns PR_TRUE if aChild is a child of this frame.
|
||||
|
@ -550,7 +550,7 @@ nsContainerFrame::AddFrame(const nsHTMLReflowState& aReflowState,
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsContainerFrame::RemoveFrame(nsIFrame* aRemovedFrame)
|
||||
nsContainerFrame::RemoveAFrame(nsIFrame* aRemovedFrame)
|
||||
{
|
||||
PRBool zap = mFrames.RemoveFrame(aRemovedFrame);
|
||||
NS_ASSERTION(zap, "failure to remove a frame");
|
||||
|
@ -138,7 +138,7 @@ protected:
|
||||
|
||||
/**
|
||||
*/
|
||||
nsresult RemoveFrame(nsIFrame * aRemovedFrame);
|
||||
nsresult RemoveAFrame(nsIFrame* aRemovedFrame);
|
||||
|
||||
/**
|
||||
* Returns PR_TRUE if aChild is a child of this frame.
|
||||
|
@ -286,7 +286,7 @@ NS_METHOD nsTableColGroupFrame::IR_TargetIsMe(nsIPresContext& aPresCont
|
||||
else
|
||||
{
|
||||
|
||||
rv = RemoveFrame(objectFrame);
|
||||
rv = RemoveAFrame(objectFrame);
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -2764,7 +2764,7 @@ NS_METHOD nsTableFrame::IR_TargetIsMe(nsIPresContext& aPresContext,
|
||||
}
|
||||
else
|
||||
{
|
||||
rv = RemoveFrame(objectFrame);
|
||||
rv = RemoveAFrame(objectFrame);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -3053,7 +3053,7 @@ NS_METHOD nsTableFrame::IR_RowGroupRemoved(nsIPresContext& aPresContext,
|
||||
nsTableRowGroupFrame * aDeletedFrame)
|
||||
{
|
||||
if (PR_TRUE==gsDebugIR) printf("TIF IR: IR_RowGroupRemoved for frame %p\n", aDeletedFrame);
|
||||
nsresult rv = RemoveFrame(aDeletedFrame);
|
||||
nsresult rv = RemoveAFrame(aDeletedFrame);
|
||||
InvalidateCellMap();
|
||||
InvalidateColumnCache();
|
||||
|
||||
|
@ -1022,7 +1022,7 @@ NS_METHOD nsTableRowFrame::IR_TargetIsMe(nsIPresContext& aPresContext,
|
||||
}
|
||||
else
|
||||
{
|
||||
rv = RemoveFrame(objectFrame);
|
||||
rv = RemoveAFrame(objectFrame);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1175,7 +1175,7 @@ NS_METHOD nsTableRowFrame::IR_CellRemoved(nsIPresContext& aPresContext,
|
||||
nsTableCellFrame * aDeletedFrame)
|
||||
{
|
||||
if (PR_TRUE==gsDebugIR) printf("\nRow IR: IR_RowRemoved\n");
|
||||
nsresult rv = RemoveFrame((nsIFrame*)aDeletedFrame);
|
||||
nsresult rv = RemoveAFrame((nsIFrame*)aDeletedFrame);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
ResetMaxChildHeight();
|
||||
|
@ -1145,7 +1145,7 @@ NS_METHOD nsTableRowGroupFrame::IR_TargetIsMe(nsIPresContext& aPresContext,
|
||||
}
|
||||
else
|
||||
{
|
||||
rv = RemoveFrame(objectFrame);
|
||||
rv = RemoveAFrame(objectFrame);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1309,7 +1309,7 @@ NS_METHOD nsTableRowGroupFrame::IR_RowRemoved(nsIPresContext& aPresContext,
|
||||
nsTableRowFrame * aDeletedFrame)
|
||||
{
|
||||
if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: IR_RowRemoved\n");
|
||||
nsresult rv = RemoveFrame((nsIFrame *)aDeletedFrame);
|
||||
nsresult rv = RemoveAFrame((nsIFrame *)aDeletedFrame);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
aReflowState.tableFrame->InvalidateCellMap();
|
||||
|
@ -286,7 +286,7 @@ NS_METHOD nsTableColGroupFrame::IR_TargetIsMe(nsIPresContext& aPresCont
|
||||
else
|
||||
{
|
||||
|
||||
rv = RemoveFrame(objectFrame);
|
||||
rv = RemoveAFrame(objectFrame);
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -2764,7 +2764,7 @@ NS_METHOD nsTableFrame::IR_TargetIsMe(nsIPresContext& aPresContext,
|
||||
}
|
||||
else
|
||||
{
|
||||
rv = RemoveFrame(objectFrame);
|
||||
rv = RemoveAFrame(objectFrame);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -3053,7 +3053,7 @@ NS_METHOD nsTableFrame::IR_RowGroupRemoved(nsIPresContext& aPresContext,
|
||||
nsTableRowGroupFrame * aDeletedFrame)
|
||||
{
|
||||
if (PR_TRUE==gsDebugIR) printf("TIF IR: IR_RowGroupRemoved for frame %p\n", aDeletedFrame);
|
||||
nsresult rv = RemoveFrame(aDeletedFrame);
|
||||
nsresult rv = RemoveAFrame(aDeletedFrame);
|
||||
InvalidateCellMap();
|
||||
InvalidateColumnCache();
|
||||
|
||||
|
@ -1022,7 +1022,7 @@ NS_METHOD nsTableRowFrame::IR_TargetIsMe(nsIPresContext& aPresContext,
|
||||
}
|
||||
else
|
||||
{
|
||||
rv = RemoveFrame(objectFrame);
|
||||
rv = RemoveAFrame(objectFrame);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1175,7 +1175,7 @@ NS_METHOD nsTableRowFrame::IR_CellRemoved(nsIPresContext& aPresContext,
|
||||
nsTableCellFrame * aDeletedFrame)
|
||||
{
|
||||
if (PR_TRUE==gsDebugIR) printf("\nRow IR: IR_RowRemoved\n");
|
||||
nsresult rv = RemoveFrame((nsIFrame*)aDeletedFrame);
|
||||
nsresult rv = RemoveAFrame((nsIFrame*)aDeletedFrame);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
ResetMaxChildHeight();
|
||||
|
@ -1145,7 +1145,7 @@ NS_METHOD nsTableRowGroupFrame::IR_TargetIsMe(nsIPresContext& aPresContext,
|
||||
}
|
||||
else
|
||||
{
|
||||
rv = RemoveFrame(objectFrame);
|
||||
rv = RemoveAFrame(objectFrame);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1309,7 +1309,7 @@ NS_METHOD nsTableRowGroupFrame::IR_RowRemoved(nsIPresContext& aPresContext,
|
||||
nsTableRowFrame * aDeletedFrame)
|
||||
{
|
||||
if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: IR_RowRemoved\n");
|
||||
nsresult rv = RemoveFrame((nsIFrame *)aDeletedFrame);
|
||||
nsresult rv = RemoveAFrame((nsIFrame *)aDeletedFrame);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
aReflowState.tableFrame->InvalidateCellMap();
|
||||
|
Loading…
x
Reference in New Issue
Block a user