fix: BrowserWindow.fromWebContents should work in browser-window-crea…

…ted (#33316) Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
electron · Mar 17, 2022 · 7283c25 · 7283c25
1 parent bf5a0cd
commit 7283c25
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/shell/common/gin_helper/trackable_object.h b/shell/common/gin_helper/trackable_object.h
@@ -117,11 +117,11 @@ class TrackableObject : public TrackableObjectBase, public EventEmitter<T> {
   ~TrackableObject() override { RemoveFromWeakMap(); }
 
   void InitWith(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) override {
-    gin_helper::WrappableBase::InitWith(isolate, wrapper);
     if (!weak_map_) {
       weak_map_ = new electron::KeyWeakMap<int32_t>;
     }
     weak_map_->Set(isolate, weak_map_id_, wrapper);
+    gin_helper::WrappableBase::InitWith(isolate, wrapper);
   }
 
  private:

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
@@ -1815,6 +1815,18 @@ describe('BrowserWindow module', () => {
       expect(BrowserWindow.fromWebContents(webviewContents)!.id).to.equal(w.id);
       await p;
     });
+
+    it('is usable immediately on browser-window-created', async () => {
+      const w = new BrowserWindow({ show: false });
+      w.loadURL('about:blank');
+      w.webContents.executeJavaScript('window.open(""); null');
+      const [win, winFromWebContents] = await new Promise((resolve) => {
+        app.once('browser-window-created', (e, win) => {
+          resolve([win, BrowserWindow.fromWebContents(win.webContents)]);
+        });
+      });
+      expect(winFromWebContents).to.equal(win);
+    });
   });
 
   describe('BrowserWindow.openDevTools()', () => {