зеркало из https://github.com/mozilla/gecko-dev.git
Bug 444963: Java hangs browser. Release branch landing. r+sr=peterv
This commit is contained in:
Родитель
29fcfcea47
Коммит
8cea9134f0
|
@ -3979,6 +3979,12 @@ nsPluginHostImpl::TrySetUpPluginInstance(const char *aMimeType,
|
|||
PRBool isJavaPlugin = pluginTag->mIsJavaPlugin;
|
||||
|
||||
if (isJavaPlugin && !pluginTag->mIsNPRuntimeEnabledJavaPlugin) {
|
||||
#if !defined(OJI) && defined(XP_MACOSX)
|
||||
// The MRJ plugin hangs if you try to load it with OJI disabled,
|
||||
// don't even try to go there.
|
||||
return NS_ERROR_FAILURE;
|
||||
#endif
|
||||
|
||||
// We must make sure LiveConnect is started, if needed.
|
||||
nsCOMPtr<nsIDocument> document;
|
||||
aOwner->GetDocument(getter_AddRefs(document));
|
||||
|
|
Загрузка…
Ссылка в новой задаче