Browse Source

Update to Node v7.9.0

Cheng Zhao 8 years ago
parent
commit
4c47f2d15e

+ 3 - 3
atom/common/api/atom_api_asar.cc

@@ -6,17 +6,17 @@
 
 #include <vector>
 
-#include "atom_natives.h"  // NOLINT: This file is generated with coffee2c.
-
 #include "atom/common/asar/archive.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
-#include "atom/common/node_includes.h"
 #include "native_mate/arguments.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 #include "native_mate/wrappable.h"
 
+#include "atom/common/node_includes.h"
+#include "atom_natives.h"  // NOLINT: This file is generated with coffee2c.
+
 namespace {
 
 class Archive : public mate::Wrappable<Archive> {

+ 1 - 2
atom/renderer/atom_renderer_client.cc

@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "atom_natives.h"  // NOLINT: This file is generated with js2c
-
 #include "atom/common/api/atom_bindings.h"
 #include "atom/common/api/event_emitter_caller.h"
 #include "atom/common/asar/asar_util.h"
@@ -27,6 +25,7 @@
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 #include "atom/common/node_includes.h"
+#include "atom_natives.h"  // NOLINT: This file is generated with js2c
 
 namespace atom {
 

+ 3 - 3
atom/renderer/atom_sandboxed_renderer_client.cc

@@ -6,14 +6,11 @@
 
 #include <string>
 
-#include "atom_natives.h"  // NOLINT: This file is generated with js2c
-
 #include "atom/common/api/api_messages.h"
 #include "atom/common/api/atom_bindings.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/native_mate_converters/v8_value_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
-#include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "atom/renderer/api/atom_api_renderer_ipc.h"
 #include "atom/renderer/atom_render_view_observer.h"
@@ -31,6 +28,9 @@
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
+#include "atom/common/node_includes.h"
+#include "atom_natives.h"  // NOLINT: This file is generated with js2c
+
 namespace atom {
 
 namespace {

+ 1 - 1
vendor/node

@@ -1 +1 @@
-Subproject commit 42eee8a69267191ac20505bf929bb39a688d7385
+Subproject commit df227c3a5db7aa8eab64c86f54588c6cd2d6c623