Bug 384845. Make the NPSetWindowCallbackStruct memory associated with
window->ws_info available before SetWindow is called, and disable the plugin window GtkSocket or xtbin creation for windowless plugins. patch by Karl Tomlinson, r+sr=jst
This commit is contained in:
@@ -1615,15 +1615,6 @@ nsPluginInstanceOwner::~nsPluginInstanceOwner()
|
||||
mTagText = nsnull;
|
||||
}
|
||||
|
||||
#if defined(XP_UNIX) && !defined(XP_MACOSX)
|
||||
// the mem for this struct is allocated
|
||||
// by PR_MALLOC in ns4xPluginInstance.cpp:ns4xPluginInstance::SetWindow()
|
||||
if (mPluginWindow && mPluginWindow->ws_info) {
|
||||
PR_Free(mPluginWindow->ws_info);
|
||||
mPluginWindow->ws_info = nsnull;
|
||||
}
|
||||
#endif
|
||||
|
||||
// clean up plugin native window object
|
||||
nsCOMPtr<nsIPluginHost> ph = do_GetService(kCPluginManagerCID);
|
||||
nsCOMPtr<nsPIPluginHost> pph(do_QueryInterface(ph));
|
||||
|
||||
Reference in New Issue
Block a user