wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 425289 - "Mousing over plugins on Mac/Linux leaks and prevents plugin from shutting down". r+sr=jst, a=schrep.

Browse Source
This commit is contained in:
bent.mozilla@gmail.com 2008-03-26 17:24:31 -07:00
parent f2aede83f9
commit c83d448e96
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
layout/generic/nsObjectFrame.cpp
View File

@ -408,6 +408,19 @@ public:
if (appShell) {
PRUint32 currentLevel = 0;
appShell->GetEventloopNestingLevel(&currentLevel);
#ifdef XP_MACOSX
// Cocoa widget code doesn't process UI events through the normal appshell
// event loop, so it needs an additional count here.
currentLevel++;
#else
// No idea how this happens... but Linux doesn't consistently process UI
// events through the appshell event loop. If we get a 0 here on any
// platform we increment the level just in case so that we make sure we
// always tear the plugin down eventually.
if (!currentLevel) {
currentLevel++;
}
#endif
if (currentLevel < mLastEventloopNestingLevel) {
mLastEventloopNestingLevel = currentLevel;
}
@ -1813,7 +1826,9 @@ nsStopPluginRunnable::Run()
if (!mTimer)
mTimer = do_CreateInstance("@mozilla.org/timer;1");
if (mTimer) {
nsresult rv = mTimer->InitWithCallback(this, 3000, nsITimer::TYPE_ONE_SHOT);
// Fire 100ms timer to try to tear down this plugin as quickly as
// possible once the nesting level comes back down.
nsresult rv = mTimer->InitWithCallback(this, 100, nsITimer::TYPE_ONE_SHOT);
if (NS_SUCCEEDED(rv)) {
return rv;
}