зеркало из https://github.com/mozilla/pjs.git
Bug 430219 - "Crash when FF3 on OS X is Quit if page contains multiple plugins" [r+sr=jst]
This commit is contained in:
Родитель
665fbc5eb2
Коммит
da9ae3fa90
|
@ -1786,10 +1786,16 @@ MatchPluginName(nsPluginInstanceOwner *aInstanceOwner, const char *aPluginName)
|
|||
static PRBool
|
||||
DoDelayedStop(nsPluginInstanceOwner *aInstanceOwner, PRBool aDelayedStop)
|
||||
{
|
||||
// Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524).
|
||||
if (aDelayedStop &&
|
||||
!::MatchPluginName(aInstanceOwner, "QuickTime") &&
|
||||
!::MatchPluginName(aInstanceOwner, "Flip4Mac")) {
|
||||
// Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524),
|
||||
// XStandard (bug 430219), CMISS Zinc (bug 429604).
|
||||
if (aDelayedStop
|
||||
#ifndef XP_WIN
|
||||
&& !::MatchPluginName(aInstanceOwner, "QuickTime")
|
||||
&& !::MatchPluginName(aInstanceOwner, "Flip4Mac")
|
||||
&& !::MatchPluginName(aInstanceOwner, "XStandard plugin")
|
||||
&& !::MatchPluginName(aInstanceOwner, "CMISS Zinc Plugin")
|
||||
#endif
|
||||
) {
|
||||
nsCOMPtr<nsIRunnable> evt = new nsStopPluginRunnable(aInstanceOwner);
|
||||
NS_DispatchToCurrentThread(evt);
|
||||
return PR_TRUE;
|
||||
|
|
Загрузка…
Ссылка в новой задаче