Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes 51759. If we ship without a plugin manager as we can do for embedding, we crash loading most pages with plugins. This change basically returns an error from Reflow if we cant get the plugin manager component. r=valeski

Browse Source
This commit is contained in:
dougt%netscape.com 2000-09-11 20:27:25 +00:00
parent b571c4c94e
commit a7d77f33f2
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/generic/nsObjectFrame.cpp
View File

@ -616,6 +616,9 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
// get the nsIPluginHost interface
pluginHost = do_GetService(kCPluginManagerCID);
if (!pluginHost)
return NS_ERROR_MODULE_PLUGINS;
mInstanceOwner->SetPluginHost(pluginHost);
rv = InstantiatePlugin(aPresContext, aMetrics, aReflowState, pluginHost, mimeType, fullURL);
}
@ -653,6 +656,9 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
// get the nsIPluginHost interface
pluginHost = do_GetService(kCPluginManagerCID);
if (!pluginHost)
return NS_ERROR_MODULE_PLUGINS;
mInstanceOwner->SetPluginHost(pluginHost);
if(pluginHost->IsPluginEnabledForType("application/x-oleobject") == NS_OK)
rv = InstantiatePlugin(aPresContext, aMetrics, aReflowState, pluginHost, "application/x-oleobject", fullURL);
@ -692,6 +698,9 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
// get the nsIPluginHost interface
pluginHost = do_GetService(kCPluginManagerCID);
if (!pluginHost)
return NS_ERROR_MODULE_PLUGINS;
mInstanceOwner->SetPluginHost(pluginHost);
mContent->GetTag(atom);
@ -2489,5 +2498,5 @@ void nsPluginInstanceOwner::SetPluginHost(nsIPluginHost* aHost)
NS_RELEASE(mPluginHost);
mPluginHost = aHost;
NS_ADDREF(mPluginHost);
NS_IF_ADDREF(mPluginHost);
}

11
layout/html/base/src/nsObjectFrame.cpp
View File

@ -616,6 +616,9 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
// get the nsIPluginHost interface
pluginHost = do_GetService(kCPluginManagerCID);
if (!pluginHost)
return NS_ERROR_MODULE_PLUGINS;
mInstanceOwner->SetPluginHost(pluginHost);
rv = InstantiatePlugin(aPresContext, aMetrics, aReflowState, pluginHost, mimeType, fullURL);
}
@ -653,6 +656,9 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
// get the nsIPluginHost interface
pluginHost = do_GetService(kCPluginManagerCID);
if (!pluginHost)
return NS_ERROR_MODULE_PLUGINS;
mInstanceOwner->SetPluginHost(pluginHost);
if(pluginHost->IsPluginEnabledForType("application/x-oleobject") == NS_OK)
rv = InstantiatePlugin(aPresContext, aMetrics, aReflowState, pluginHost, "application/x-oleobject", fullURL);
@ -692,6 +698,9 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext,
// get the nsIPluginHost interface
pluginHost = do_GetService(kCPluginManagerCID);
if (!pluginHost)
return NS_ERROR_MODULE_PLUGINS;
mInstanceOwner->SetPluginHost(pluginHost);
mContent->GetTag(atom);
@ -2489,5 +2498,5 @@ void nsPluginInstanceOwner::SetPluginHost(nsIPluginHost* aHost)
NS_RELEASE(mPluginHost);
mPluginHost = aHost;
NS_ADDREF(mPluginHost);
NS_IF_ADDREF(mPluginHost);
}