Revert the incorrect portion of bug 543788 which was landed in electrolysis without final review.

--HG--
extra : rebase_source : e91a8f11604d11d669aca6e19c83629bc3f47f80
This commit is contained in:
Benjamin Smedberg 2010-02-11 15:50:57 -05:00
Родитель ae64801a4a
Коммит fab2d98e23
1 изменённых файлов: 11 добавлений и 5 удалений

Просмотреть файл

@ -330,11 +330,6 @@ EnsureSharedSurfaceSize(gfxIntSize size)
PRBool nsWindow::OnPaint(HDC aDC)
{
if (mWindowType == eWindowType_plugin) {
ValidateRect(mWnd, NULL);
return PR_TRUE;
}
#ifdef MOZ_IPC
// We never have reentrant paint events, except when we're running our RPC
// windows event spin loop. If we don't trap for this, we'll try to paint,
@ -342,6 +337,17 @@ PRBool nsWindow::OnPaint(HDC aDC)
// flashes on the plugin rendering surface.
if (mozilla::ipc::RPCChannel::IsSpinLoopActive() && mPainting)
return PR_FALSE;
if (mWindowType == eWindowType_plugin) {
PluginInstanceParent* instance = reinterpret_cast<PluginInstanceParent*>(
::GetPropW(mWnd, L"PluginInstanceParentProperty"));
if (instance) {
if (!instance->CallUpdateWindow())
NS_ERROR("Failed to send message!");
ValidateRect(mWnd, NULL);
return PR_TRUE;
}
}
#endif
nsPaintEvent willPaintEvent(PR_TRUE, NS_WILL_PAINT, this);