From 1cd340798f1fa26009124feadaf9eb96e3be25a0 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Sat, 22 Oct 2005 03:27:22 +0000 Subject: [PATCH] Stop plugins correctly when storing a page into session history (bug 311791). Patch by bzbarsky, r+sr=me. git-svn-id: svn://10.0.0.236/trunk@182768 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsPresShell.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 7ed58929a41..4d9f8375d29 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -6202,8 +6202,11 @@ StopPluginInstance(PresShell *aShell, nsIContent *aContent) instance->Destroy(); } + // XXXbz have to use the plugin manager contract because the plugin host + // registers for two different contracts with two difference CIDs! We want + // the plugin manager CID, since that's the one nsObjectFrame gets. nsCOMPtr pluginHost = - do_GetService("@mozilla.org/plugin/host;1"); + do_GetService("@mozilla.org/plugin/manager;1"); if (pluginHost) pluginHost->StopPluginInstance(instance); }