nwjs master

Author: rogerwang

.gitignore

@@ -500,3 +500,5 @@ vs-chromium-project.txt
 /win8/metro_driver/metro_driver_version_resources.xml
 /x86-generic_out/
 /xcodebuild
+/content/nw
+

.gn

@@ -215,6 +215,7 @@ check_targets = [
 #      this situation much easier to create. if the build always lists the
 #      files and passes them to a script, it will always be correct.
 exec_script_whitelist = [
+  "//content/nw/BUILD.gn",
   "//android_webview/BUILD.gn",
   "//build/config/BUILD.gn",
   "//build/config/android/config.gni",

BUILD.gn

@@ -217,6 +217,7 @@ group("both_gn_and_gyp") {
 
   if (!is_ios && !is_android && !is_chromecast) {
     deps += [
+      "//content/nw:nwjs",
       "//chrome",
       "//chrome/test:browser_tests",
       "//chrome/test:interactive_ui_tests",

DEPS

@@ -15,6 +15,8 @@ vars = {
     'https://chromium.googlesource.com',
   'freetype_android_revision':
     'c38be52bf8de3b1699d74932b849bf150265819e',
+  'nwjs_git':
+    'https://github.com/nwjs',
   'google_toolbox_for_mac_revision':
     'e7b41fad2e7f77abf560c79f984c60d5ec6d419c',
   'libfuzzer_revision':
@@ -174,8 +176,13 @@ deps = {
     (Var("chromium_git")) + '/chromium/deps/acid3.git@6be0a66a1ebd7ebc5abc1b2f405a945f6d871521',
   'src/tools/swarming_client':
     (Var("chromium_git")) + '/external/swarming.client.git@380e32662312eb107f06fcba6409b0409f8fef72',
-  'src/v8':
-    (Var("chromium_git")) + '/v8/v8.git@1ae9314d1ba4a31d1a230a6f17cc26e1ddf80e97'
+  #'src/v8':
+  #  (Var("chromium_git")) + '/v8/v8.git@1ae9314d1ba4a31d1a230a6f17cc26e1ddf80e97'
+  #  (Var("nwjs_git")) + '/v8.git@origin/nw16',
+  #'src/content/nw':
+  #  (Var("nwjs_git")) + '/nw.js.git@origin/nw16',
+  #'src/third_party/node':
+  #  (Var("nwjs_git")) + '/node.git@origin/nw16',
 }
 
 deps_os = {
@@ -981,7 +988,18 @@ hooks = [
       '.',
     'name':
       'clang_format_merge_driver'
-  }
+  },
+  {
+    'action': [
+      'python',
+      'src/content/nw/tools/patcher.py',
+      '--patch-config', 'src/content/nw/patch/patch.cfg'
+    ],
+    'pattern':
+      '.',
+    'name':
+      'nw_patch'
+  },
 ]
 
 include_rules = [

apps/app_lifetime_monitor.cc

@@ -86,8 +86,10 @@ void AppLifetimeMonitor::OnAppWindowRemoved(AppWindow* app_window) {
 }
 
 void AppLifetimeMonitor::OnAppWindowHidden(AppWindow* app_window) {
+#if 0
   if (!HasOtherVisibleAppWindows(app_window))
     NotifyAppDeactivated(app_window->extension_id());
+#endif
 }
 
 void AppLifetimeMonitor::OnAppWindowShown(AppWindow* app_window,

apps/app_load_service.cc

@@ -4,6 +4,8 @@
 
 #include "apps/app_load_service.h"
 
+#include "content/nw/src/nw_content.h"
+
 #include "apps/app_load_service_factory.h"
 #include "apps/app_restore_service.h"
 #include "apps/launcher.h"
@@ -70,6 +72,8 @@ bool AppLoadService::LoadAndLaunch(const base::FilePath& extension_path,
     return false;
   }
 
+  nw::SetMainExtensionId(extension_id);
+
   // Schedule the app to be launched once loaded.
   PostReloadAction& action = post_reload_actions_[extension_id];
   action.action_type = LAUNCH_FOR_LOAD_AND_LAUNCH;

apps/launcher.cc

@@ -103,7 +103,10 @@ class PlatformAppPathLauncher
         extension_id(app->id()),
         entry_paths_(entry_paths),
         mime_type_collector_(profile),
-        is_directory_collector_(profile) {}
+        is_directory_collector_(profile) {
+    if (app->is_nwjs_app()) //NWJS#5097
+      entry_paths_.clear();
+  }
 
   PlatformAppPathLauncher(Profile* profile,
                           const Extension* app,
@@ -112,7 +115,7 @@ class PlatformAppPathLauncher
         extension_id(app->id()),
         mime_type_collector_(profile),
         is_directory_collector_(profile) {
-    if (!file_path.empty())
+    if (!file_path.empty() && !app->is_nwjs_app()) //NWJS#5097
       entry_paths_.push_back(file_path);
   }
 

base/BUILD.gn

@@ -527,6 +527,8 @@ component("base") {
     "message_loop/message_pump_libevent.h",
     "message_loop/message_pump_mac.h",
     "message_loop/message_pump_mac.mm",
+    "message_loop/message_pump_uv.cc",
+    "message_loop/message_pump_uv.h",
     "message_loop/message_pump_win.cc",
     "message_loop/message_pump_win.h",
     "metrics/bucket_ranges.cc",

base/base_switches.cc

@@ -111,4 +111,5 @@ const char kEnableCrashReporterForTesting[] =
     "enable-crash-reporter-for-testing";
 #endif
 
+const char kNWJS[] = "nwjs";
 }  // namespace switches

base/base_switches.h

@@ -39,6 +39,7 @@ extern const char kDisableUsbKeyboardDetect[];
 extern const char kEnableCrashReporterForTesting[];
 #endif
 
+extern const char kNWJS[];
 }  // namespace switches
 
 #endif  // BASE_BASE_SWITCHES_H_