Changeset 46649 in vbox for trunk/src/libs/xpcom18a4/java

Timestamp:

Jun 19, 2013 11:47:32 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86538

Message:

Forward ported r85941 and required build fixes (Main: Implemented new event queue to separate system's native event queue and our own. Also, XPCOM is not needed for handling our own events. On Windows this also fixes the system's queue quota limitation).

Location:

trunk

Files:

• . (modified) (1 prop)
• src/libs/xpcom18a4 (modified) (1 prop)
• src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp (modified) (2 diffs)
• src/libs/xpcom18a4/java/src/nsThreadUtils.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp

@@ -355 +355 @@
 
 #ifdef VBOX
-#  include <VBox/com/EventQueue.h>
+#  include <VBox/com/NativeEventQueue.h>
 #  include <iprt/err.h>
 
@@ -361 +361 @@
 XPCOM_NATIVE2(waitForEvents) (JNIEnv *env, jobject, jlong aTimeout)
 {
-    com::EventQueue* aEventQ = com::EventQueue::getMainEventQueue();
+    com::NativeEventQueue* aEventQ = com::NativeEventQueue::getMainEventQueue();
     NS_WARN_IF_FALSE(aEventQ != nsnull, "Null main event queue");
     if (!aEventQ)

trunk/src/libs/xpcom18a4/java/src/nsThreadUtils.h

@@ -51 +51 @@
 }
 
-#include "VBox/com/EventQueue.h"
+#include "VBox/com/NativeEventQueue.h"
 
 inline already_AddRefed<nsIEventQueue> do_GetMainThreadQueue()
 {
-  com::EventQueue* eq = com::EventQueue::getMainEventQueue();
+  com::NativeEventQueue* eq = com::NativeEventQueue::getMainEventQueue();
   NS_ASSERTION(eq != nsnull, "Must be valid");
   return eq->getIEventQueue();