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

Bug 384845. Make the NPSetWindowCallbackStruct memory associated with

Browse Source 
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


git-svn-id: svn://10.0.0.236/trunk@229218 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2007-07-03 03:29:47 +00:00
parent 055f95f9eb
commit 8d279490c0
3 changed files with 114 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
View File

@@ -64,6 +64,7 @@ public:
virtual nsresult CallSetWindow(nsCOMPtr<nsIPluginInstance> &aPluginInstance);
private:
GtkWidget* mGtkSocket;
NPSetWindowCallbackStruct m_ws_info;
nsresult CreateXEmbedWindow();
void SetAllocation();
PRBool CanGetValueFromPlugin(nsCOMPtr<nsIPluginInstance> &aPluginInstance);
@@ -80,9 +81,14 @@ nsPluginNativeWindowGtk2::nsPluginNativeWindowGtk2() : nsPluginNativeWindow()
width = 0;
height = 0;
memset(&clipRect, 0, sizeof(clipRect));
ws_info = nsnull;
ws_info = &m_ws_info;
type = nsPluginWindowType_Window;
mGtkSocket = 0;
m_ws_info.type = 0;
m_ws_info.display = nsnull;
m_ws_info.visual = nsnull;
m_ws_info.colormap = 0;
m_ws_info.depth = 0;
}
nsPluginNativeWindowGtk2::~nsPluginNativeWindowGtk2()
@@ -111,28 +117,30 @@ nsresult PLUG_DeletePluginNativeWindow(nsPluginNativeWindow * aPluginNativeWindo
nsresult nsPluginNativeWindowGtk2::CallSetWindow(nsCOMPtr<nsIPluginInstance> &aPluginInstance)
{
if(aPluginInstance) {
nsresult rv;
PRBool val = PR_FALSE;
if(!mGtkSocket) {
if (CanGetValueFromPlugin(aPluginInstance))
rv = aPluginInstance->GetValue
((nsPluginInstanceVariable)NPPVpluginNeedsXEmbed, &val);
}
if (type == nsPluginWindowType_Window) {
nsresult rv;
PRBool val = PR_FALSE;
if(!mGtkSocket) {
if (CanGetValueFromPlugin(aPluginInstance))
rv = aPluginInstance->GetValue
((nsPluginInstanceVariable)NPPVpluginNeedsXEmbed, &val);
}
#ifdef DEBUG
printf("nsPluginNativeWindowGtk2: NPPVpluginNeedsXEmbed=%d\n", val);
printf("nsPluginNativeWindowGtk2: NPPVpluginNeedsXEmbed=%d\n", val);
#endif
if(val) {
CreateXEmbedWindow();
}
if(val) {
CreateXEmbedWindow();
}
if(mGtkSocket) {
// Make sure to resize and re-place the window if required
SetAllocation();
window = (nsPluginPort *)gtk_socket_get_id(GTK_SOCKET(mGtkSocket));
}
if(mGtkSocket) {
// Make sure to resize and re-place the window if required
SetAllocation();
window = (nsPluginPort *)gtk_socket_get_id(GTK_SOCKET(mGtkSocket));
}
#ifdef DEBUG
printf("nsPluginNativeWindowGtk2: call SetWindow with xid=%p\n", (void *)window);
printf("nsPluginNativeWindowGtk2: call SetWindow with xid=%p\n", (void *)window);
#endif
}
aPluginInstance->SetWindow(this);
}
else if (mPluginInstance)