Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #315841 don't flush frames in order to ensure that plugins are instantiated.

Browse Source 
also, don't flush when inside of ObjectURIChanged
r+sr=bz


git-svn-id: svn://10.0.0.236/trunk@185638 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de
2005-12-03 11:27:42 +00:00
parent 304ac02c70
commit d01ec451f8
5 changed files with 120 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/layout/base/nsPresShell.cpp
View File

@@ -152,6 +152,7 @@
#include "nsIFocusController.h"
#include "nsIPluginInstance.h"
#include "nsIObjectFrame.h"
#include "nsIObjectLoadingContent.h"
#include "nsNetUtil.h"
// Drag & Drop, Clipboard
@@ -6185,15 +6186,6 @@ StopPluginInstance(PresShell *aShell, nsIContent *aContent)
if (!objectFrame)
return;
nsCOMPtr<nsIPluginInstance> instance;
objectFrame->GetPluginInstance(*getter_AddRefs(instance));
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));
objectFrame->StopPlugin();
}
@@ -6229,20 +6221,10 @@ PresShell::Freeze()
static void
StartPluginInstance(PresShell *aShell, nsIContent *aContent)
{
// For now we just reconstruct the frame, but only if the element
// 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 && frame->GetProperty(nsLayoutAtoms::objectFrame)) {
// Note: no need to remove the property here, since we're about
// to blow away the frame
aShell->RecreateFramesFor(aContent);
}
}
nsCOMPtr<nsIObjectLoadingContent> objlc(do_QueryInterface(aContent));
NS_ASSERTION(objlc, "Object nodes must implement nsIObjectLoadingContent");
nsCOMPtr<nsIPluginInstance> inst;
objlc->EnsureInstantiation(getter_AddRefs(inst));
}
PR_STATIC_CALLBACK(PRBool)