corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing 143178 -- refreshing plugins before going to the plugin finder sevice, r=peterl, sr=beard

Browse Source
This commit is contained in:
av@netscape.com
2002-05-16 20:41:26 +00:00
parent 8e4a46e1e3
commit dffd08b807
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
docshell/base/nsDocShell.cpp
View File

@@ -125,6 +125,8 @@
// for embedding
#include "nsIWebBrowserChromeFocus.h"
#include "nsPluginError.h"
static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
static NS_DEFINE_CID(kDocumentCharsetInfoCID, NS_DOCUMENTCHARSETINFO_CID);
@@ -4183,14 +4185,15 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
docLoaderFactory(do_CreateInstance(contractId.get()));
if (!docLoaderFactory) {
// try again after loading plugins
nsresult err;
nsCOMPtr<nsIPluginHost> pluginHost =
do_GetService(kPluginManagerCID, &err);
if (NS_FAILED(err))
nsCOMPtr<nsIPluginManager> pluginManager = do_GetService(kPluginManagerCID);
if (!pluginManager)
return NS_ERROR_FAILURE;
pluginHost->LoadPlugins();
// no need to do anything if plugins have not been changed
// PR_FALSE will ensure that currently running plugins will not be shut down
// but the plugin list will still be updated with newly installed plugins
if (NS_ERROR_PLUGINS_PLUGINSNOTCHANGED == pluginManager->ReloadPlugins(PR_FALSE))
return NS_ERROR_FAILURE;
docLoaderFactory = do_CreateInstance(contractId.get());