зеркало из https://github.com/mozilla/pjs.git
bug 304896: Null check mNavigator when we set it, since it isn't guaranteed to be non-null. r+sr=jst
This commit is contained in:
Родитель
bcda04d178
Коммит
fda7e7762d
|
@ -948,9 +948,11 @@ nsGlobalWindow::SetNewDocument(nsIDOMDocument* aDocument,
|
|||
mInnerWindowHolder = wsh->GetInnerWindowHolder();
|
||||
mNavigator = wsh->GetNavigator(); // This assignment addrefs.
|
||||
|
||||
// Update mNavigator's docshell pointer now.
|
||||
mNavigator->SetDocShell(mDocShell);
|
||||
mNavigator->LoadingNewDocument();
|
||||
if (mNavigator) {
|
||||
// Update mNavigator's docshell pointer now.
|
||||
mNavigator->SetDocShell(mDocShell);
|
||||
mNavigator->LoadingNewDocument();
|
||||
}
|
||||
} else {
|
||||
if (thisChrome) {
|
||||
newInnerWindow = new nsGlobalChromeWindow(this);
|
||||
|
|
Загрузка…
Ссылка в новой задаче