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 550118: Try to not process XPCOM events when a plugin process spins a nested glib event loop. r=karlt

Browse Source
This commit is contained in:
Chris Jones 2010-03-11 01:35:29 -06:00
parent 64b0390f9c
commit a3aa9cbbff
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/plugins/PluginModuleParent.cpp
View File

@ -36,6 +36,10 @@
*
* ***** END LICENSE BLOCK ***** */
#ifdef MOZ_WIDGET_GTK2
#include <glib.h>
#endif
#include "base/process_util.h"
#include "mozilla/ipc/SyncChannel.h"
@ -45,7 +49,6 @@
#include "nsContentUtils.h"
#include "nsCRT.h"
#include "nsNPAPIPlugin.h"
#include "nsThreadUtils.h"
using base::KillProcess;
@ -875,17 +878,12 @@ PluginModuleParent::AnswerProcessSomeEvents()
{
PLUGIN_LOG_DEBUG(("Spinning mini nested loop ..."));
// XXX it would seem sensical to make the condition be
// |NS_HasPendingEvents() && i < kMaxEventsToProcess|. The
// problem is, the native appshell is just an observer of our
// nsThread, and processes native events as a side effect of
// nsThread::ProcessNextEvent(). Since native events are the ones
// we really care about here, we need to go straight to
// NS_ProcessNextEvent().
for (int i = 0; i < kMaxChancesToProcessEvents; ++i)
NS_ProcessNextEvent(nsnull, PR_FALSE);
int i = 0;
for (; i < kMaxChancesToProcessEvents; ++i)
if (!g_main_context_iteration(NULL, FALSE))
break;
PLUGIN_LOG_DEBUG(("... quitting mini nested loop"));
PLUGIN_LOG_DEBUG(("... quitting mini nested loop; processed %i tasks", i));
return true;
}