зеркало из https://github.com/mozilla/pjs.git
Bug 156405 Tabbed browsing frequently crashes Mozilla - Trunk M130A [@ nsXULWindow::ContentShellAdded]
patch by bsmedberg@covad.net r=roc+moz, sr=roc+moz, a=roc+moz
This commit is contained in:
Родитель
21a4877a90
Коммит
b4af4f3315
|
@ -5916,9 +5916,10 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
|
||||||
// if the new frame was already initialized to initialize it again.
|
// if the new frame was already initialized to initialize it again.
|
||||||
if (!frameHasBeenInitialized) {
|
if (!frameHasBeenInitialized) {
|
||||||
|
|
||||||
InitAndRestoreFrame(aPresContext, aState, aContent,
|
rv = InitAndRestoreFrame(aPresContext, aState, aContent,
|
||||||
geometricParent, aStyleContext, nsnull, newFrame);
|
geometricParent, aStyleContext, nsnull, newFrame);
|
||||||
|
|
||||||
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// if our parent is a block frame then do things the way html likes it
|
// if our parent is a block frame then do things the way html likes it
|
||||||
|
|
|
@ -1227,7 +1227,8 @@ nsHTMLFrameInnerFrame::Init(nsIPresContext* aPresContext,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shouldCreateDoc) {
|
if (shouldCreateDoc) {
|
||||||
ShowDocShell(aPresContext);
|
rv = ShowDocShell(aPresContext);
|
||||||
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
}
|
}
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
|
@ -1227,7 +1227,8 @@ nsHTMLFrameInnerFrame::Init(nsIPresContext* aPresContext,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shouldCreateDoc) {
|
if (shouldCreateDoc) {
|
||||||
ShowDocShell(aPresContext);
|
rv = ShowDocShell(aPresContext);
|
||||||
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
}
|
}
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
|
@ -5916,9 +5916,10 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
|
||||||
// if the new frame was already initialized to initialize it again.
|
// if the new frame was already initialized to initialize it again.
|
||||||
if (!frameHasBeenInitialized) {
|
if (!frameHasBeenInitialized) {
|
||||||
|
|
||||||
InitAndRestoreFrame(aPresContext, aState, aContent,
|
rv = InitAndRestoreFrame(aPresContext, aState, aContent,
|
||||||
geometricParent, aStyleContext, nsnull, newFrame);
|
geometricParent, aStyleContext, nsnull, newFrame);
|
||||||
|
|
||||||
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// if our parent is a block frame then do things the way html likes it
|
// if our parent is a block frame then do things the way html likes it
|
||||||
|
|
Загрузка…
Ссылка в новой задаче