зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1074415 - Build error in nsNPAPIPluginInstance when enabling PR_LOGGING in non-debug builds. r=dholbert
--HG-- extra : rebase_source : 8247d79d89ba761a4f942f32a651c41d534adc5f
This commit is contained in:
Родитель
6da972fd5b
Коммит
1746aa7fa8
|
@ -558,16 +558,21 @@ nsresult nsNPAPIPluginInstance::SetWindow(NPWindow* window)
|
|||
|
||||
NPPAutoPusher nppPusher(&mNPP);
|
||||
|
||||
DebugOnly<NPError> error;
|
||||
NPError error;
|
||||
NS_TRY_SAFE_CALL_RETURN(error, (*pluginFunctions->setwindow)(&mNPP, (NPWindow*)window), this,
|
||||
NS_PLUGIN_CALL_UNSAFE_TO_REENTER_GECKO);
|
||||
// 'error' is only used if this is a logging-enabled build.
|
||||
// That is somewhat complex to check, so we just use "unused"
|
||||
// to suppress any compiler warnings in build configurations
|
||||
// where the logging is a no-op.
|
||||
mozilla::unused << error;
|
||||
|
||||
mInPluginInitCall = oldVal;
|
||||
|
||||
NPP_PLUGIN_LOG(PLUGIN_LOG_NORMAL,
|
||||
("NPP SetWindow called: this=%p, [x=%d,y=%d,w=%d,h=%d], clip[t=%d,b=%d,l=%d,r=%d], return=%d\n",
|
||||
this, window->x, window->y, window->width, window->height,
|
||||
window->clipRect.top, window->clipRect.bottom, window->clipRect.left, window->clipRect.right, (NPError)error));
|
||||
window->clipRect.top, window->clipRect.bottom, window->clipRect.left, window->clipRect.right, error));
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче