Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix restarting of plugins when restoring from bfcache. Bug 313669, r+sr=bryner

Browse Source
This commit is contained in:
bzbarsky%mit.edu 2005-10-25 01:32:14 +00:00
parent a2d06014dd
commit f44f93ebc5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/base/nsPresShell.cpp
View File

@ -6185,6 +6185,10 @@ StopPluginInstance(PresShell *aShell, nsIContent *aContent)
if (!instance)
return;
// Note on the frame that it used to have a plugin instance, since
// we're about to make said instance go away
frame->SetProperty(nsLayoutAtoms::objectFrame, NS_INT32_TO_PTR(1));
// Check whether the plugin wants SetWindow to be called before or after
// Stop/Destroy. This is similar to nsObjectFrame::Destroy(), but we
// don't want to destroy the frame just yet.
@ -6244,17 +6248,17 @@ static void
StartPluginInstance(PresShell *aShell, nsIContent *aContent)
{
// For now we just reconstruct the frame, but only if the element
// has a plugin instance.
// had a plugin instance before we stopped it. Other types of
// embedded content (eg SVG) become unhappy if we do a frame
// reconstruct here.
nsIFrame *frame = aShell->GetPrimaryFrameFor(aContent);
if (frame) {
nsIObjectFrame *objFrame = nsnull;
CallQueryInterface(frame, &objFrame);
if (objFrame) {
nsCOMPtr<nsIPluginInstance> instance;
objFrame->GetPluginInstance(*getter_AddRefs(instance));
if (instance) {
aShell->RecreateFramesFor(aContent);
}
if (objFrame && frame->GetProperty(nsLayoutAtoms::objectFrame)) {
// Note: no need to remove the property here, since we're about
// to blow away the frame
aShell->RecreateFramesFor(aContent);
}
}
}