fixed IRIX build problem.
git-svn-id: svn://10.0.0.236/trunk@7071 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -549,7 +549,7 @@ ns4xPlugin::_invalidateregion(NPP npp, NPRegion invalidRegion)
|
||||
if (NS_OK == peer->QueryInterface(kIWindowlessPluginInstancePeerIID, (void **)&wpeer))
|
||||
{
|
||||
// XXX nsRegion & NPRegion are typedef'd to the same thing
|
||||
wpeer->InvalidateRegion((nsPluginRegion*) invalidRegion);
|
||||
wpeer->InvalidateRegion((nsPluginRegion)invalidRegion);
|
||||
NS_RELEASE(wpeer);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -170,9 +170,11 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
|
||||
|
||||
nsresult error = NS_OK;
|
||||
|
||||
if (fCallbacks->setwindow) {
|
||||
if (fCallbacks->setwindow)
|
||||
{
|
||||
// XXX Turns out that NPPluginWindow and NPWindow are structurally
|
||||
// identical (on purpose!), so there's no need to make a copy.
|
||||
|
||||
error = (nsresult) CallNPP_SetWindowProc(fCallbacks->setwindow,
|
||||
&fNPP,
|
||||
(NPWindow*) window);
|
||||
@@ -180,6 +182,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
|
||||
// XXX In the old code, we'd just ignore any errors coming
|
||||
// back from the plugin's SetWindow(). Is this the correct
|
||||
// behavior?!?
|
||||
|
||||
NS_ASSERTION(error == NS_OK, "error in setwindow");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user