зеркало из https://github.com/mozilla/gecko-dev.git
Fixing bustage.
This commit is contained in:
Родитель
12f1e1ab60
Коммит
1634235d1e
|
@ -349,15 +349,8 @@ XRemoteService::AddBrowserInstance(nsIDOMWindowInternal *aBrowser)
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
nsCOMPtr<nsIDocShell> docShell;
|
|
||||||
scriptObject->GetDocShell(getter_AddRefs(docShell));
|
|
||||||
if (!docShell) {
|
|
||||||
NS_WARNING("Failed to get docshell object for browser instance");
|
|
||||||
return NS_ERROR_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
nsCOMPtr<nsIBaseWindow> baseWindow;
|
nsCOMPtr<nsIBaseWindow> baseWindow;
|
||||||
baseWindow = do_QueryInterface(docShell);
|
baseWindow = do_QueryInterface(scriptObject->GetDocShell());
|
||||||
if (!baseWindow) {
|
if (!baseWindow) {
|
||||||
NS_WARNING("Failed to get base window for browser instance");
|
NS_WARNING("Failed to get base window for browser instance");
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
|
@ -830,15 +823,13 @@ XRemoteService::OpenURL(nsCString &aArgument,
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
nsCOMPtr<nsIDocShell> docShell;
|
nsCOMPtr<nsIDocShell> docShell = scriptObject->GetDocShell();
|
||||||
scriptObject->GetDocShell(getter_AddRefs(docShell));
|
|
||||||
if (!docShell) {
|
if (!docShell) {
|
||||||
NS_WARNING("Failed to get docshell object for browser instance");
|
NS_WARNING("Failed to get docshell object for browser instance");
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
nsCOMPtr<nsIDocShellTreeItem> item;
|
nsCOMPtr<nsIDocShellTreeItem> item(do_QueryInterface(docShell));
|
||||||
item = do_QueryInterface(docShell);
|
|
||||||
if (!item) {
|
if (!item) {
|
||||||
NS_WARNING("failed to get doc shell tree item for browser instance");
|
NS_WARNING("failed to get doc shell tree item for browser instance");
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче