Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for blocker bug #195386. regression caused by checkin for bug #97324

Browse Source 
thanks to cbiesinger@web.de for the quick fix.  r/sr=sspitzer
This commit is contained in:
sspitzer%netscape.com 2003-02-28 17:23:52 +00:00
parent 9e8b7c6c7b
commit b39140bd02
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docshell/base/nsDocShell.cpp
View File

@ -4393,8 +4393,12 @@ nsDocShell::CreateAboutBlankContentViewer()
nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID));
if (!catMan)
return NS_ERROR_FAILURE;
nsXPIDLCString contractId;
catMan->GetCategoryEntry("Gecko-Content-Viewers", "text/html", getter_Copies(contractId));
rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", "text/html", getter_Copies(contractId));
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIDocumentLoaderFactory> docFactory(do_GetService(contractId));
if (docFactory) {
@ -4533,8 +4537,11 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
if (NS_FAILED(rv))
return rv;
nsXPIDLCString contractId;
catMan->GetCategoryEntry("Gecko-Content-Viewers", aContentType, getter_Copies(contractId));
rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", aContentType, getter_Copies(contractId));
if (NS_FAILED(rv))
return rv;
// Create an instance of the document-loader-factory
nsCOMPtr<nsIDocumentLoaderFactory>
@ -4551,8 +4558,11 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
if (NS_ERROR_PLUGINS_PLUGINSNOTCHANGED == pluginManager->ReloadPlugins(PR_FALSE))
return NS_ERROR_FAILURE;
catMan->GetCategoryEntry("Gecko-Content-Viewers", aContentType,
rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", aContentType,
getter_Copies(contractId));
if (NS_FAILED(rv))
return rv;
docLoaderFactory = do_GetService(contractId.get());
if (!docLoaderFactory)