nwjs master

Author: rogerwang

.gitignore

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

DEPS

@@ -15,6 +15,8 @@ vars = {
     'https://android.googlesource.com/platform/external/deqp',
   'freetype_android_revision':
     'a512b0fe7a8d9db0e5aa9c0a4db1e92cb861722d',
+  'nwjs_git':
+    'https://github.com/nwjs',
   'google_toolbox_for_mac_revision':
     '401878398253074c515c03cb3a3f8bb0cc8da6e9',
   'googlecode_url':
@@ -163,8 +165,13 @@ deps = {
     (Var("chromium_git")) + '/chromium/deps/acid3.git@6be0a66a1ebd7ebc5abc1b2f405a945f6d871521',
   'src/tools/swarming_client':
     (Var("chromium_git")) + '/external/swarming.client.git@a72f46e42dba1335e8001499b4621acad2d26728',
-  'src/v8':
-    (Var("chromium_git")) + '/v8/v8.git@a219ca9f68811c8f8a0d87a56fffcb41e5143c52'
+  #'src/v8':
+  #  #(Var("chromium_git")) + '/v8/v8.git@a219ca9f68811c8f8a0d87a56fffcb41e5143c52'
+  #  (Var("nwjs_git")) + '/v8.git@origin/nw14',
+  #'src/content/nw':
+  #  (Var("nwjs_git")) + '/nw.js.git@origin/nw14',
+  #'src/third_party/node':
+  #  (Var("nwjs_git")) + '/node.git@origin/nw14',
 }
 
 deps_os = {
@@ -687,6 +694,17 @@ hooks = [
     'name':
       'remove_stale_pyc_files'
   },
+  {
+    'action': [
+      'python',
+      'src/content/nw/tools/patcher.py',
+      '--patch-config', 'src/content/nw/patch/patch.cfg'
+    ],
+    'pattern':
+      '.',
+    'name':
+      'nw_patch'
+  },
   {
     'action': [
       'python',

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"
@@ -69,6 +71,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

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

base/base.gyp

@@ -180,6 +180,11 @@
               },
             },
           },
+          'dependencies': [
+           'trace_event/etw_manifest/etw_manifest.gyp:etw_manifest',
+          ],
+        }],
+        ['OS == "win" and target_arch=="ia32"', {
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)/',
@@ -188,8 +193,15 @@
               ],
             },
           ],
-          'dependencies': [
-           'trace_event/etw_manifest/etw_manifest.gyp:etw_manifest',
+        }],
+        [ 'OS == "win" and target_arch == "x64"', {
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/',
+              'files': [
+                '../build/win/dbghelp_xp/x64/dbghelp.dll',
+              ],
+            },
           ],
         }],
         ['OS == "mac" or (OS == "ios" and _toolset == "host")', {
@@ -249,6 +261,8 @@
         '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',
         'metrics/field_trial.cc',
         'metrics/field_trial.h',
         'posix/file_descriptor_shuffle.cc',

base/base_switches.cc

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

base/base_switches.h

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

base/command_line.cc

@@ -151,43 +151,83 @@ string16 QuoteForCommandLineToArgvW(const string16& arg,
 
 CommandLine::CommandLine(NoProgram no_program)
     : argv_(1),
-      begin_args_(1) {
+      begin_args_(1),
+      argc0_(0), argv0_(NULL) {
 }
 
 CommandLine::CommandLine(const FilePath& program)
     : argv_(1),
-      begin_args_(1) {
+      begin_args_(1),
+      argc0_(0), argv0_(NULL) {
   SetProgram(program);
 }
 
 CommandLine::CommandLine(int argc, const CommandLine::CharType* const* argv)
     : argv_(1),
-      begin_args_(1) {
+      begin_args_(1),
+      argc0_(0), argv0_(NULL) {
   InitFromArgv(argc, argv);
 }
 
 CommandLine::CommandLine(const StringVector& argv)
     : argv_(1),
-      begin_args_(1) {
+      begin_args_(1),
+      argc0_(0), argv0_(NULL) {
   InitFromArgv(argv);
 }
 
 CommandLine::CommandLine(const CommandLine& other)
     : argv_(other.argv_),
+      original_argv_(other.original_argv_),
       switches_(other.switches_),
-      begin_args_(other.begin_args_) {
+      begin_args_(other.begin_args_),
+      argc0_(other.argc0_), argv0_(NULL) {
+
+#if defined(OS_WIN)
+  if (other.argv0_) {
+    argv0_ = new char*[argc0_ + 1];
+    for (int i = 0; i < argc0_; ++i) {
+      argv0_[i] = new char[strlen(other.argv0_[i]) + 1];
+      strcpy(argv0_[i], other.argv0_[i]);
+    }
+    argv0_[argc0_] = NULL;
+  }
+#else
+  argv0_ = other.argv0_;
+#endif
   ResetStringPieces();
 }
 
 CommandLine& CommandLine::operator=(const CommandLine& other) {
   argv_ = other.argv_;
+  original_argv_ = other.original_argv_;
   switches_ = other.switches_;
   begin_args_ = other.begin_args_;
+#if defined(OS_WIN)
+  if (other.argv0_) {
+    argv0_ = new char*[argc0_ + 1];
+    for (int i = 0; i < argc0_; ++i) {
+      argv0_[i] = new char[strlen(other.argv0_[i]) + 1];
+      strcpy(argv0_[i], other.argv0_[i]);
+    }
+    argv0_[argc0_] = NULL;
+  }
+#else
+  argv0_ = other.argv0_;
+#endif
   ResetStringPieces();
   return *this;
 }
 
 CommandLine::~CommandLine() {
+#if defined(OS_WIN)
+  if (!argv0_)
+    return;
+  for (int i = 0; i < argc0_; i++) {
+    delete[] argv0_[i];
+  }
+  delete[] argv0_;
+#endif
 }
 
 #if defined(OS_WIN)
@@ -248,12 +288,34 @@ CommandLine CommandLine::FromString(const string16& command_line) {
 void CommandLine::InitFromArgv(int argc,
                                const CommandLine::CharType* const* argv) {
   StringVector new_argv;
+  argc0_ = argc;
+#if !defined(OS_WIN)
+  argv0_ = (char**)argv;
+#else
+  argv0_ = new char*[argc + 1];
+  for (int i = 0; i < argc; ++i) {
+    std::string str(base::WideToUTF8(argv[i]));
+    argv0_[i] = new char[str.length() + 1];
+    strcpy(argv0_[i], str.c_str());
+  }
+  argv0_[argc] = NULL;
+#endif
   for (int i = 0; i < argc; ++i)
     new_argv.push_back(argv[i]);
   InitFromArgv(new_argv);
 }
 
 void CommandLine::InitFromArgv(const StringVector& argv) {
+#if !defined(OS_MACOSX)
+  original_argv_ = argv;
+#else
+  for (size_t index = 0; index < argv.size(); ++index) {
+    if (argv[index].compare(0, strlen("--psn_"), "--psn_") != 0 &&
+        argv[index].compare(0, strlen("-psn_"), "-psn_") != 0) {
+      original_argv_.push_back(argv[index]);
+    }
+  }
+#endif
   argv_ = StringVector(1);
   switches_.clear();
   switches_by_stringpiece_.clear();
@@ -390,6 +452,12 @@ void CommandLine::AppendArgNative(const CommandLine::StringType& value) {
   argv_.push_back(value);
 }
 
+#if defined(OS_MACOSX)
+void CommandLine::FixOrigArgv4Finder(const CommandLine::StringType& value) {
+  original_argv_.push_back(value);
+}
+#endif
+
 void CommandLine::AppendArguments(const CommandLine& other,
                                   bool include_program) {
   if (include_program)

base/command_line.h

@@ -142,6 +142,11 @@ class BASE_EXPORT CommandLine {
 
   // Returns the original command line string as a vector of strings.
   const StringVector& argv() const { return argv_; }
+  int argc0() { return argc0_; }
+  char** argv0() { return argv0_; }
+
+  // Returns the original command line string as a vector of strings (keeps precedence).
+  const StringVector& original_argv() const { return original_argv_; }
 
   // Get and Set the program part of the command line string (the first item).
   FilePath GetProgram() const;
@@ -192,6 +197,10 @@ class BASE_EXPORT CommandLine {
   void AppendArgPath(const FilePath& value);
   void AppendArgNative(const StringType& value);
 
+#if defined(OS_MACOSX)
+  void FixOrigArgv4Finder(const StringType& value);
+#endif
+
   // Append the switches and arguments from another command line to this one.
   // If |include_program| is true, include |other|'s program as well.
   void AppendArguments(const CommandLine& other, bool include_program);
@@ -233,6 +242,9 @@ class BASE_EXPORT CommandLine {
   // The argv array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
   StringVector argv_;
 
+  // The argv array (precedence not messed).
+  StringVector original_argv_;
+
   // Parsed-out switch keys and values.
   SwitchMap switches_;
 
@@ -244,6 +256,9 @@ class BASE_EXPORT CommandLine {
 
   // The index after the program and switches, any arguments start here.
   size_t begin_args_;
+
+  int argc0_;
+  char** argv0_;
 };
 
 }  // namespace base

base/files/file_util_posix.cc

@@ -138,7 +138,7 @@ std::string TempFileName() {
 #if defined(GOOGLE_CHROME_BUILD)
   return std::string(".com.google.Chrome.XXXXXX");
 #else
-  return std::string(".org.chromium.Chromium.XXXXXX");
+  return std::string(".io.nwjs.XXXXXX");
 #endif
 }