corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 54215f2cbc66

Browse Source 
to fix Bug 454186
SM crashes when try to download file [@ nsString::ToInteger - nsTreeBodyFrame::PaintProgressMeter]
This commit is contained in:
2008-09-08 16:00:32 +02:00
parent d8ad390726
commit bc80cb1791
13 changed files with 36 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
layout/generic/nsContainerFrame.cpp
View File

@@ -223,10 +223,7 @@ nsContainerFrame::RemoveFrame(nsIAtom* aListName,
if (!parent->mFrames.DestroyFrame(aOldFrame)) {
// Try to remove it from our overflow list, if we have one.
// The simplest way is to reuse StealFrame.
#ifdef DEBUG
nsresult rv =
#endif
StealFrame(PresContext(), aOldFrame, PR_TRUE);
nsresult rv = StealFrame(PresContext(), aOldFrame, PR_TRUE);
NS_ASSERTION(NS_SUCCEEDED(rv), "Could not find frame to remove!");
aOldFrame->Destroy();
}
@@ -492,7 +489,8 @@ SyncFrameViewGeometryDependentProperties(nsPresContext* aPresContext,
PRBool isCanvas;
const nsStyleBackground* bg;
nsCSSRendering::FindBackground(aPresContext, aFrame, &bg, &isCanvas);
PRBool hasBG =
nsCSSRendering::FindBackground(aPresContext, aFrame, &bg, &isCanvas);
if (isCanvas) {
nsIView* rootView;
@@ -1099,7 +1097,8 @@ void
nsContainerFrame::DeleteNextInFlowChild(nsPresContext* aPresContext,
nsIFrame* aNextInFlow)
{
NS_PRECONDITION(aNextInFlow->GetPrevInFlow(), "bad prev-in-flow");
nsIFrame* prevInFlow = aNextInFlow->GetPrevInFlow();
NS_PRECONDITION(prevInFlow, "bad prev-in-flow");
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).
@@ -1124,10 +1123,7 @@ nsContainerFrame::DeleteNextInFlowChild(nsPresContext* aPresContext,
nsSplittableFrame::BreakFromPrevFlow(aNextInFlow);
// Take the next-in-flow out of the parent's child list
#ifdef DEBUG
nsresult rv =
#endif
StealFrame(aPresContext, aNextInFlow);
nsresult rv = StealFrame(aPresContext, aNextInFlow);
NS_ASSERTION(NS_SUCCEEDED(rv), "StealFrame failure");
// Delete the next-in-flow frame and its descendants.