diff options
| -rw-r--r-- | base/message_pump_libevent.cc | 4 | ||||
| -rw-r--r-- | base/message_pump_libevent_unittest.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/base/message_pump_libevent.cc b/base/message_pump_libevent.cc index 3e3facf..1b4c023 100644 --- a/base/message_pump_libevent.cc +++ b/base/message_pump_libevent.cc @@ -54,6 +54,7 @@ MessagePumpLibevent::FileDescriptorWatcher::FileDescriptorWatcher() : is_persistent_(false), event_(NULL), pump_(NULL), + watcher_(NULL), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { } @@ -350,7 +351,8 @@ void MessagePumpLibevent::OnLibeventNotification(int fd, short flags, if (flags & EV_WRITE) { controller->OnFileCanWriteWithoutBlocking(fd, pump); } - // Check |controller| in case it's been deleted in this callback. + // Check |controller| in case it's been deleted in + // controller->OnFileCanWriteWithoutBlocking(). if (controller.get() && flags & EV_READ) { controller->OnFileCanReadWithoutBlocking(fd, pump); } diff --git a/base/message_pump_libevent_unittest.cc b/base/message_pump_libevent_unittest.cc index 2a6d7bc..9ec78de 100644 --- a/base/message_pump_libevent_unittest.cc +++ b/base/message_pump_libevent_unittest.cc @@ -8,7 +8,6 @@ #include "base/message_loop.h" #include "base/threading/thread.h" -#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(USE_SYSTEM_LIBEVENT) |