From 7b9ff66399515ad3c4edb3bdc3c3ea38b924680c Mon Sep 17 00:00:00 2001 From: Ben Turner Date: Thu, 28 Jan 2010 12:23:07 -0800 Subject: [PATCH] Bug 542337 - '[OOPP] hang in test_plugin_clipping2.xhtml' Followup fix, r=roc. --HG-- extra : transplant_source : ._%92%D6%40%FE%1E%92%01%11%7F%BA%2A%EF%24Y%84%DC6%0E --- modules/plugin/base/src/nsPluginNativeWindowWin.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/plugin/base/src/nsPluginNativeWindowWin.cpp b/modules/plugin/base/src/nsPluginNativeWindowWin.cpp index 1da808af5f14..41ed29693e73 100644 --- a/modules/plugin/base/src/nsPluginNativeWindowWin.cpp +++ b/modules/plugin/base/src/nsPluginNativeWindowWin.cpp @@ -549,7 +549,10 @@ nsresult nsPluginNativeWindowWin::SubclassAndAssociateWindow() // Out of process plugins must not have the WS_CLIPCHILDREN style set on their // parent windows or else synchronous paints (via UpdateWindow() and others) // will cause deadlocks. - style &= ~WS_CLIPCHILDREN; + if (::GetPropW(hWnd, L"PluginInstanceParentProperty")) + style &= ~WS_CLIPCHILDREN; + else + style |= WS_CLIPCHILDREN; #else style |= WS_CLIPCHILDREN; #endif