mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup the node bindings code.

Browse source
This commit is contained in:
Cheng Zhao 2013-07-22 15:25:39 +08:00
parent 1f019b36d2
commit fa9e939745
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/node_bindings.cc
View file

@ -5,18 +5,19 @@
#include "common/node_bindings.h" #include "common/node_bindings.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "v8/include/v8.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "vendor/node/src/node.h" #include "vendor/node/src/node.h"
#include "vendor/node/src/node_internals.h" #include "vendor/node/src/node_internals.h"
#include "vendor/node/src/node_javascript.h" #include "vendor/node/src/node_javascript.h"
#if defined(OS_WIN)
#include "base/strings/utf_string_conversions.h"
#endif
using content::BrowserThread; using content::BrowserThread;
namespace atom { namespace atom {

24
common/node_bindings.h
View file

@ -61,18 +61,6 @@ class NodeBindings {
// Main thread's libuv loop. // Main thread's libuv loop.
uv_loop_t* uv_loop_; uv_loop_t* uv_loop_;
// Dummy handle to make uv's loop not quit.
uv_async_t dummy_uv_handle_;
// Thread for polling events.
uv_thread_t embed_thread_;
// Whether we're done.
bool embed_closed_;
// Semaphore to wait for main loop in the embed thread.
uv_sem_t embed_sem_;
private: private:
// Thread to poll uv events. // Thread to poll uv events.
static void EmbedThreadRunner(void *arg); static void EmbedThreadRunner(void *arg);
@ -80,6 +68,18 @@ class NodeBindings {
// Called when uv's watcher queue changes. // Called when uv's watcher queue changes.
static void OnWatcherQueueChanged(uv_loop_t* loop); static void OnWatcherQueueChanged(uv_loop_t* loop);
// Whether the libuv loop has ended.
bool embed_closed_;
// Dummy handle to make uv's loop not quit.
uv_async_t dummy_uv_handle_;
// Thread for polling events.
uv_thread_t embed_thread_;
// Semaphore to wait for main loop in the embed thread.
uv_sem_t embed_sem_;
DISALLOW_COPY_AND_ASSIGN(NodeBindings); DISALLOW_COPY_AND_ASSIGN(NodeBindings);
}; };