Bug 430219 - "Crash when FF3 on OS X is Quit if page contains multiple plugins" [r+sr=jst]
authorMatthew Gregan <kinetik@flim.org> and Shane Blackett <shane@blackett.co.nz>
Sat, 12 Jul 2008 05:28:50 -0500
changeset 15870 4cdf6817a49ca33884a8c003aff18bffbe1b5eb3
parent 15869 085edeb5e56d2656b79229d652a08f44b7538e18
child 15871 1a566d8d546b469fa62d93766935e31c61546754
push id564
push userreed@reedloden.com
push dateSat, 12 Jul 2008 10:33:13 +0000
treeherderautoland@2ac26a817782 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs430219
milestone1.9.1a1pre
Bug 430219 - "Crash when FF3 on OS X is Quit if page contains multiple plugins" [r+sr=jst]
layout/generic/nsObjectFrame.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1781,20 +1781,26 @@ MatchPluginName(nsPluginInstanceOwner *a
   return strncmp(aInstanceOwner->GetPluginName(),
                  aPluginName,
                  strlen(aPluginName)) == 0;
 }
 
 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;
   }
   return PR_FALSE;
 }
 
 static void