diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-09-04 11:14:07 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-10-11 12:28:34 +0000 |
| commit | 9ae8ddaeea11f48dbe08c1e9fd0987af3ab1ce8f (patch) | |
| tree | 69440d61fb79e788d31066e508ec15293595b7e8 | |
| parent | 580ffe2cb7500a210ec7e10ad312f45fb1152572 (diff) | |
| download | qtwebengine-chromium-9ae8ddaeea11f48dbe08c1e9fd0987af3ab1ce8f.tar.gz | |
Reintroduce glib event loop 3/3
Do not compile libevent when using glib, add missing
glib io message loop pump.
Change-Id: I0979659298889045475576cf5176433e9c587e9e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/base/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/base/message_loop/message_pump_for_io.h | 4 | ||||
| -rw-r--r-- | chromium/base/message_loop/message_pump_libevent.cc | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/chromium/base/BUILD.gn b/chromium/base/BUILD.gn index 995f6c3ed68..a771b62587b 100644 --- a/chromium/base/BUILD.gn +++ b/chromium/base/BUILD.gn @@ -54,7 +54,7 @@ declare_args() { } # Determines whether libevent should be dep. -dep_libevent = !is_fuchsia && !is_win && !(is_nacl && !is_nacl_nonsfi) +dep_libevent = !is_fuchsia && !is_win && !(is_nacl && !is_nacl_nonsfi) && !use_glib # Determines whether message_pump_libevent should be used. use_libevent = dep_libevent && !is_ios diff --git a/chromium/base/message_loop/message_pump_for_io.h b/chromium/base/message_loop/message_pump_for_io.h index 6aac1e609fb..85a91745f25 100644 --- a/chromium/base/message_loop/message_pump_for_io.h +++ b/chromium/base/message_loop/message_pump_for_io.h @@ -18,6 +18,8 @@ #include "base/message_loop/message_pump_default.h" #elif defined(OS_FUCHSIA) #include "base/message_loop/message_pump_fuchsia.h" +#elif defined(USE_GLIB) +#include "base/message_loop/message_pump_glib.h" #elif defined(OS_POSIX) #include "base/message_loop/message_pump_libevent.h" #endif @@ -33,6 +35,8 @@ using MessagePumpForIO = MessagePumpIOSForIO; using MessagePumpForIO = MessagePumpDefault; #elif defined(OS_FUCHSIA) using MessagePumpForIO = MessagePumpFuchsia; +#elif defined(USE_GLIB) +using MessagePumpForIO = MessagePumpGlib; #elif defined(OS_POSIX) using MessagePumpForIO = MessagePumpLibevent; #else diff --git a/chromium/base/message_loop/message_pump_libevent.cc b/chromium/base/message_loop/message_pump_libevent.cc index 6b924bc9219..37b2034535e 100644 --- a/chromium/base/message_loop/message_pump_libevent.cc +++ b/chromium/base/message_loop/message_pump_libevent.cc @@ -23,6 +23,9 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif +#if defined(USE_GLIB) +#error configured with glib but trying to compile libevent message pump +#endif // Lifecycle of struct event // Libevent uses two main data structures: // struct event_base (of which there is one per message pump), and |