Merge branch 'nw49' into nw50

rogerwang · rogerwang · commit 1d295e8c692e · 2020-10-16T02:06:23.000-06:00
diff --git a/src/api/nw_current_window_internal.idl b/src/api/nw_current_window_internal.idl
@@ -34,7 +34,7 @@ namespace nw.currentWindowInternal {
     static void leaveKioskModeInternal(optional long id);
     static void toggleKioskModeInternal(optional long id);
     static bool isKioskInternal(optional long id);
-    static void capturePageInternal(optional CapturePageOptions options, optional CapturePageCallback callback);
+    static void capturePageInternal(long id, optional CapturePageOptions options, optional CapturePageCallback callback);
     static void clearMenu(optional long win);
     static MenuPatch[] setMenu(long id, optional long winId);
     static void reloadIgnoringCache();
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -320,14 +320,26 @@ NwCurrentWindowInternalCapturePageInternalFunction::Run() {
   EXTENSION_FUNCTION_VALIDATE(args_);
 
   std::unique_ptr<ImageDetails> image_details;
-  if (args_->GetSize() > 0) {
+  WebContents* contents = nullptr;
+
+  if (args_->GetSize() > 1) {
     base::Value* spec = NULL;
-    EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &spec) && spec);
+    EXTENSION_FUNCTION_VALIDATE(args_->Get(1, &spec) && spec);
     image_details = ImageDetails::FromValue(*spec);
   }
 
-  content::RenderFrameHost* rfh = render_frame_host();
-  WebContents* contents = content::WebContents::FromRenderFrameHost(rfh);
+  if (base::FeatureList::IsEnabled(::features::kNWNewWin)) {
+    int id = 0;
+    args_->GetInteger(0, &id);
+    Browser* browser = getBrowser(this, id);
+    if (!browser) {
+      return RespondNow(Error("no browser window found"));
+    }
+    contents = browser->tab_strip_model()->GetActiveWebContents();
+  } else {
+    content::RenderFrameHost* rfh = render_frame_host();
+    contents = content::WebContents::FromRenderFrameHost(rfh);
+  }
   if (!contents)
     return RespondNow(Error("contents is null"));
 
diff --git a/src/resources/api_nw_newwin.js b/src/resources/api_nw_newwin.js
@@ -54,7 +54,6 @@ var nwWinEventsMap = {
 };
 
 var nwWrapEventsMap = {
-  'loaded':           'LoadingStateChanged',
   'new-win-policy':   'onNewWinPolicy',
   'navigation':       'onNavigation'
 };
@@ -265,6 +264,14 @@ NWWindow.prototype.on = function (event, callback, record) {
   return this;
 };
 NWWindow.prototype.removeListener = function (event, callback) {
+  if (event === 'loaded') {
+    for (let l of chrome.tabs.onUpdated.getListeners()) {
+      if (l.listener && l.listener === callback) {
+        chrome.tabs.onUpdated.removeListener(l);
+        return this;
+      }
+    }
+  }
   if (nwWinEventsMap.hasOwnProperty(event)) {
     for (let l of this[nwWinEventsMap[event]].getListeners()) {
       if (l.listener && l.listener === callback) {
@@ -320,6 +327,12 @@ NWWindow.prototype.removeAllListeners = function (event) {
     }
     return this;
   }
+  if (event === 'loaded') {
+    for (let l of chrome.tabs.onUpdated.getListeners()) {
+      chrome.tabs.onUpdated.removeListener(l);
+    }
+    return this;
+  }
   return this;
 };
 
@@ -363,6 +376,7 @@ NWWindow.prototype.showDevTools = function(frm, callback) {
   nwNatives.setDevToolsJail(f);
   currentNWWindowInternal.showDevTools2Internal(this.cWindow.id, callback);
 };
+
 NWWindow.prototype.capturePage = function (callback, options) {
   var cb = callback;
   if (!options)
@@ -383,7 +397,8 @@ NWWindow.prototype.capturePage = function (callback, options) {
     };
     cb = cb.bind(undefined, options.datatype);
   }
-  currentNWWindowInternal.capturePageInternal(options, cb);
+  this.cWindow = currentNWWindowInternal.getCurrent(this.cWindow.id, {'populate': true});
+  currentNWWindowInternal.capturePageInternal(this.cWindow.id, options, cb);
 };
 
 function sendCommand(tabId, name, options) {
diff --git a/src/resources/api_nw_window.js b/src/resources/api_nw_window.js
@@ -403,7 +403,7 @@ apiBridge.registerCustomHook(function(bindingsAPI) {
         };
         cb = cb.bind(undefined, options.datatype);
       }
-      currentNWWindowInternal.capturePageInternal(options, cb);
+      currentNWWindowInternal.capturePageInternal(0, options, cb);
     };
     NWWindow.prototype.reload = function () {
       this.appWindow.contentWindow.location.reload();

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ apiBridge.registerCustomHook(function(bindingsAPI) {`
`403`	`403`	`};`
`404`	`404`	`cb = cb.bind(undefined, options.datatype);`
`405`	`405`	`}`
`406`		`- currentNWWindowInternal.capturePageInternal(options, cb);`
	`406`	`+ currentNWWindowInternal.capturePageInternal(0, options, cb);`
`407`	`407`	`};`
`408`	`408`	`NWWindow.prototype.reload = function () {`
`409`	`409`	`this.appWindow.contentWindow.location.reload();`