Index: base/message_loop.cc |
=================================================================== |
--- base/message_loop.cc (revision 90809) |
+++ base/message_loop.cc (working copy) |
@@ -22,13 +22,11 @@ |
#if defined(OS_MACOSX) |
#include "base/message_pump_mac.h" |
#endif |
-#if defined(OS_POSIX) |
-#include "base/message_pump_libevent.h" |
-#endif |
#if defined(OS_POSIX) && !defined(OS_MACOSX) |
#include <gdk/gdk.h> |
#include <gdk/gdkx.h> |
+#include "base/message_pump_libevent.h" |
#if defined(TOUCH_UI) |
#include "base/message_pump_x.h" |
#else |
@@ -176,7 +174,7 @@ |
#define MESSAGE_PUMP_IO new base::MessagePumpForIO() |
#elif defined(OS_MACOSX) |
#define MESSAGE_PUMP_UI base::MessagePumpMac::Create() |
-#define MESSAGE_PUMP_IO new base::MessagePumpLibevent() |
+#define MESSAGE_PUMP_IO base::MessagePumpMac::Create() |
Mark Mentovai
2011/06/29 01:21:21
As I mentioned last week, I don’t really want to m
|
#elif defined(TOUCH_UI) |
#define MESSAGE_PUMP_UI new base::MessagePumpX() |
#define MESSAGE_PUMP_IO new base::MessagePumpLibevent() |
@@ -856,6 +854,21 @@ |
return pump_io()->WaitForIOCompletion(timeout, filter); |
} |
+#elif defined(OS_MACOSX) |
+ |
+bool MessageLoopForIO::WatchFileDescriptor(int fd, |
+ bool persistent, |
+ Mode mode, |
+ FileDescriptorWatcher *controller, |
+ Watcher *delegate) { |
+ return pump_mac()->WatchFileDescriptor( |
+ fd, |
+ persistent, |
+ static_cast<base::MessagePumpCFRunLoopBase::Mode>(mode), |
+ controller, |
+ delegate); |
+} |
+ |
#elif defined(OS_POSIX) && !defined(OS_NACL) |
bool MessageLoopForIO::WatchFileDescriptor(int fd, |