Bug 430219 - "Crash when FF3 on OS X is Quit if page contains multiple plugins" [r+sr=jst]

This commit is contained in:
Matthew Gregan ext:(%20and%20Shane%20Blackett%20%3Cshane%40blackett.co.nz%3E) 2008-07-12 05:28:50 -05:00
Родитель 665fbc5eb2
Коммит da9ae3fa90
1 изменённых файлов: 10 добавлений и 4 удалений

Просмотреть файл

@ -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;