diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 20:16:11 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 20:16:11 +0000 |
| commit | e4d7096ca0d34bd5db54b8b956cc2be938d22af4 (patch) | |
| tree | f7188d4b78762c8b0fb549182f2a8c6afab48de9 /base/message_pump_libevent.cc | |
| parent | 0659fd45950d9e85bbf5d90fad7c4f970cdab51b (diff) | |
| download | chromium_src-e4d7096ca0d34bd5db54b8b956cc2be938d22af4.zip chromium_src-e4d7096ca0d34bd5db54b8b956cc2be938d22af4.tar.gz chromium_src-e4d7096ca0d34bd5db54b8b956cc2be938d22af4.tar.bz2 | |
Cleanup for r93201.
The initializer for watcher_ in the FileDescriptorWatcher constructor
was deleted accidentally.
USE_SYSTEM_LIBEVENT is defined by the build system, so we don't need
to include "build/build_config.h".
R=willchan@chromium.org
BUG=88134
TEST=MessagePumpLibeventTest.*
Review URL: http://codereview.chromium.org/7473017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_libevent.cc')
| -rw-r--r-- | base/message_pump_libevent.cc | 4 |
1 files changed, 3 insertions, 1 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); } |