nw2: fix crash on Window.setShadow()

rogerwang · rogerwang · commit 90d2c43fcb69 · 2019-11-24T19:09:15.000-07:00
Fix nwjs#7232
diff --git a/src/api/nw_current_window_internal.idl b/src/api/nw_current_window_internal.idl
@@ -23,7 +23,7 @@ namespace nw.currentWindowInternal {
 
   interface Functions {
     static void close(optional boolean force, optional long id);
-    static void setShadow(boolean shadow);
+    static void setShadowInternal(boolean shadow, optional long id);
     static void showDevToolsInternal(optional ShowDevToolsCallback callback);
     static void showDevTools2Internal(long id, optional ShowDevToolsCallback callback);
     static void closeDevTools();
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -821,13 +821,21 @@ bool NwCurrentWindowInternalGetTitleInternalFunction::RunNWSync(base::ListValue*
 }
 
 ExtensionFunction::ResponseAction
-NwCurrentWindowInternalSetShadowFunction::Run() {
+NwCurrentWindowInternalSetShadowInternalFunction::Run() {
 #if defined(OS_MACOSX)
   EXTENSION_FUNCTION_VALIDATE(args_);
   bool shadow;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(0, &shadow));
-  AppWindow* window = getAppWindow(this);
-  SetShadowOnWindow(window->GetNativeWindow().GetNativeNSWindow(), shadow);
+  if (base::FeatureList::IsEnabled(::features::kNWNewWin)) {
+    int id = 0;
+    args_->GetInteger(1, &id);
+    Browser* browser = getBrowser(this, id);
+    if (browser)
+      SetShadowOnWindow(browser->window()->GetNativeWindow().GetNativeNSWindow(), shadow);
+  } else {
+    AppWindow* window = getAppWindow(this);
+    SetShadowOnWindow(window->GetNativeWindow().GetNativeNSWindow(), shadow);
+  }
 #endif
   return RespondNow(NoArguments());
 }
diff --git a/src/api/nw_window_api.h b/src/api/nw_window_api.h
@@ -136,19 +136,19 @@ class NwCurrentWindowInternalSetMenuFunction : public NWSyncExtensionFunction {
   DISALLOW_COPY_AND_ASSIGN(NwCurrentWindowInternalSetMenuFunction);
 };
 
-class NwCurrentWindowInternalSetShadowFunction : public ExtensionFunction {
+class NwCurrentWindowInternalSetShadowInternalFunction : public ExtensionFunction {
  public:
-  NwCurrentWindowInternalSetShadowFunction(){}
+  NwCurrentWindowInternalSetShadowInternalFunction(){}
 
  protected:
-  ~NwCurrentWindowInternalSetShadowFunction() override {}
+  ~NwCurrentWindowInternalSetShadowInternalFunction() override {}
 #if defined(OS_MACOSX)
   void SetShadowOnWindow(NSWindow *window, bool shadow);
 #endif
 
   // ExtensionFunction:
   ResponseAction Run() override;
-  DECLARE_EXTENSION_FUNCTION("nw.currentWindowInternal.setShadow", UNKNOWN)
+  DECLARE_EXTENSION_FUNCTION("nw.currentWindowInternal.setShadowInternal", UNKNOWN)
 };
 
 class NwCurrentWindowInternalSetBadgeLabelFunction : public ExtensionFunction {
diff --git a/src/api/nw_window_api_mac.mm b/src/api/nw_window_api_mac.mm
@@ -47,7 +47,7 @@ - (void)drawRect:(NSRect)dirtyRect {
 
 namespace extensions {
 
-void NwCurrentWindowInternalSetShadowFunction::SetShadowOnWindow(NSWindow *window, bool shadow) {
+void NwCurrentWindowInternalSetShadowInternalFunction::SetShadowOnWindow(NSWindow *window, bool shadow) {
   window.hasShadow = shadow;
 }
 
diff --git a/src/resources/api_nw_newwin.js b/src/resources/api_nw_newwin.js
@@ -309,7 +309,7 @@ NWWindow.prototype.removeAllListeners = function (event) {
 };
 
 NWWindow.prototype.setShadow = function(shadow) {
-  currentNWWindowInternal.setShadow(shadow);
+  currentNWWindowInternal.setShadowInternal(shadow, this.cWindow.id);
 };
 
 NWWindow.prototype.showDevTools = function(frm, callback) {
diff --git a/src/resources/api_nw_window.js b/src/resources/api_nw_window.js
@@ -344,7 +344,7 @@ apiBridge.registerCustomHook(function(bindingsAPI) {
     };
 
     NWWindow.prototype.setShadow = function(shadow) {
-      currentNWWindowInternal.setShadow(shadow);
+      currentNWWindowInternal.setShadowInternal(shadow);
     }
 
     NWWindow.prototype.showDevTools = function(frm, callback) {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ - (void)drawRect:(NSRect)dirtyRect {`
`47`	`47`
`48`	`48`	`namespace extensions {`
`49`	`49`
`50`		`-void NwCurrentWindowInternalSetShadowFunction::SetShadowOnWindow(NSWindow *window, bool shadow) {`
	`50`	`+void NwCurrentWindowInternalSetShadowInternalFunction::SetShadowOnWindow(NSWindow *window, bool shadow) {`
`51`	`51`	`window.hasShadow = shadow;`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ apiBridge.registerCustomHook(function(bindingsAPI) {`
`344`	`344`	`};`
`345`	`345`
`346`	`346`	`NWWindow.prototype.setShadow = function(shadow) {`
`347`		`- currentNWWindowInternal.setShadow(shadow);`
	`347`	`+ currentNWWindowInternal.setShadowInternal(shadow);`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`NWWindow.prototype.showDevTools = function(frm, callback) {`