зеркало из https://github.com/mozilla/pjs.git
Hmm, looks like the orange on linux is due to a bug in gcc 2.95, there have been issues with using nsCOMPtr's in narrow scopes with that compiler before, so maybe this'll fix this crash too. Who knows, but it's worth a try. This changes nothing, so no reviews...
This commit is contained in:
Родитель
12ff598f07
Коммит
6e303ef2ea
|
@ -976,14 +976,12 @@ nsHTMLFrameInnerFrame::ShowDocShell(nsIPresContext* aPresContext)
|
|||
nsCOMPtr<nsIDOMWindow> win(do_GetInterface(docShell));
|
||||
NS_ENSURE_TRUE(win, NS_ERROR_UNEXPECTED);
|
||||
|
||||
{
|
||||
nsCOMPtr<nsIDOMDocument> dom_doc;
|
||||
nsCOMPtr<nsIDOMDocument> dom_doc;
|
||||
|
||||
// This will synchronously create a document if there is no
|
||||
// document in the window yet.
|
||||
// This will synchronously create a document if there is no
|
||||
// document in the window yet.
|
||||
|
||||
win->GetDocument(getter_AddRefs(dom_doc));
|
||||
}
|
||||
win->GetDocument(getter_AddRefs(dom_doc));
|
||||
|
||||
nsCOMPtr<nsIPresShell> presShell;
|
||||
docShell->GetPresShell(getter_AddRefs(presShell));
|
||||
|
|
|
@ -976,14 +976,12 @@ nsHTMLFrameInnerFrame::ShowDocShell(nsIPresContext* aPresContext)
|
|||
nsCOMPtr<nsIDOMWindow> win(do_GetInterface(docShell));
|
||||
NS_ENSURE_TRUE(win, NS_ERROR_UNEXPECTED);
|
||||
|
||||
{
|
||||
nsCOMPtr<nsIDOMDocument> dom_doc;
|
||||
nsCOMPtr<nsIDOMDocument> dom_doc;
|
||||
|
||||
// This will synchronously create a document if there is no
|
||||
// document in the window yet.
|
||||
// This will synchronously create a document if there is no
|
||||
// document in the window yet.
|
||||
|
||||
win->GetDocument(getter_AddRefs(dom_doc));
|
||||
}
|
||||
win->GetDocument(getter_AddRefs(dom_doc));
|
||||
|
||||
nsCOMPtr<nsIPresShell> presShell;
|
||||
docShell->GetPresShell(getter_AddRefs(presShell));
|
||||
|
|
Загрузка…
Ссылка в новой задаче