diff --git a/common/node_bindings_mac.cc b/common/node_bindings_mac.cc index 0a31a1dd1fa..3397e35a5ed 100644 --- a/common/node_bindings_mac.cc +++ b/common/node_bindings_mac.cc @@ -26,23 +26,6 @@ NodeBindingsMac::NodeBindingsMac(bool is_browser) NodeBindingsMac::~NodeBindingsMac() { } -void NodeBindingsMac::RunMessageLoop() { - // Get notified when libuv's watcher queue changes. - uv_loop_->data = this; - uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged; - - NodeBindings::RunMessageLoop(); -} - -// static -void NodeBindingsMac::OnWatcherQueueChanged(uv_loop_t* loop) { - NodeBindingsMac* self = static_cast(loop->data); - - // We need to break the io polling in the kqueue thread when loop's watcher - // queue changes, otherwise new events cannot be notified. - self->WakeupEmbedThread(); -} - void NodeBindingsMac::PollEvents() { struct timespec spec; int timeout = uv_backend_timeout(uv_loop_); diff --git a/common/node_bindings_mac.h b/common/node_bindings_mac.h index 4929c1a2cf6..6ae79c0a60b 100644 --- a/common/node_bindings_mac.h +++ b/common/node_bindings_mac.h @@ -15,12 +15,7 @@ class NodeBindingsMac : public NodeBindings { explicit NodeBindingsMac(bool is_browser); virtual ~NodeBindingsMac(); - virtual void RunMessageLoop() OVERRIDE; - private: - // Called when uv's watcher queue changes. - static void OnWatcherQueueChanged(uv_loop_t* loop); - virtual void PollEvents() OVERRIDE; // Kqueue to poll for uv's backend fd. diff --git a/vendor/node b/vendor/node index 2fce49829b4..efc9599187e 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit 2fce49829b4dde69bceed91c00cec578517541b0 +Subproject commit efc9599187eb8a3b350b8f6eb7aa463a7d1c329f