Fix nwjs#7609: mixed_context window option for new_instance window

rogerwang · rogerwang · commit 9f2c53113920 · 2020-10-30T05:17:14.000-06:00
diff --git a/src/api/nw_window.idl b/src/api/nw_window.idl
@@ -35,6 +35,7 @@ namespace nw.Window {
     [nodoc] boolean? kiosk;
     [nodoc] boolean? focus;
     [nodoc] boolean? new_instance;
+    [nodoc] boolean? mixed_context;
     [nodoc] boolean? show_in_taskbar;
     [nodoc] DOMString? title;
     [nodoc] DOMString? position;
diff --git a/src/browser/nw_content_browser_hooks.cc b/src/browser/nw_content_browser_hooks.cc
@@ -54,6 +54,7 @@ namespace nw {
 namespace {
 
 bool g_pinning_renderer = true;
+bool g_mixed_context = false;
 bool g_in_webview_apply_attr = false;
 bool g_in_webview_apply_attr_allow_nw = false;
 } //namespace
@@ -192,6 +193,14 @@ void SetPinningRenderer(bool pin) {
   g_pinning_renderer = pin;
 }
 
+bool MixedContext() {
+  return g_mixed_context;
+}
+
+void SetMixedContext(bool mixed) {
+  g_mixed_context = mixed;
+}
+
 void SetInWebViewApplyAttr(bool flag, bool allow_nw) {
   g_in_webview_apply_attr = flag;
   g_in_webview_apply_attr_allow_nw = allow_nw;
diff --git a/src/browser/nw_content_browser_hooks.h b/src/browser/nw_content_browser_hooks.h
@@ -48,6 +48,7 @@ CONTENT_EXPORT void OverrideWebkitPrefsHook(content::RenderViewHost* rvh, conten
 // content/browser/renderer_host/render_process_host_impl.cc
 // content/browser/site_instance_impl.cc
 CONTENT_EXPORT bool PinningRenderer();
+CONTENT_EXPORT bool MixedContext();
 
 #if defined(OS_MAC)
 // ref in chrome/browser/app_controller_mac.mm
@@ -62,6 +63,7 @@ CONTENT_EXPORT bool GetPackageImage(nw::Package* package,
                     gfx::Image* image);
 // ref in extensions/browser/api/app_window/app_window_api.cc
 CONTENT_EXPORT void SetPinningRenderer(bool pin);
+CONTENT_EXPORT void SetMixedContext(bool);
 
 // browser
 // ref in content/nw/src/api/tray/tray_aura.cc
diff --git a/src/renderer/nw_extensions_renderer_hooks.cc b/src/renderer/nw_extensions_renderer_hooks.cc
@@ -219,6 +219,9 @@ void ContextCreationHook(blink::WebLocalFrame* frame, ScriptContext* context) {
 
   if (extension)
     extension->manifest()->GetBoolean(manifest_keys::kNWJSMixedContext, &mixed_context);
+  if (!mixed_context) {
+    mixed_context = command_line.HasSwitch("mixed-context");
+  }
   // handle navigation in webview #5622
   if (nwjs_guest_nw)
     mixed_context = true;
diff --git a/src/resources/api_nw_newwin.js b/src/resources/api_nw_newwin.js
@@ -809,6 +809,12 @@ apiBridge.registerCustomHook(function(bindingsAPI) {
         options.new_instance = true;
         options.setSelfAsOpener = false;
       }
+      if (params.mixed_context === true) {
+        if (params.new_instance !== true) {
+          throw new Error('mixed_context should be set with new_instance in nw.Window.open');
+        }
+        options.mixed_context = true;
+      }
       if (params.position)
         options.position = params.position;
       if (params.title)
