mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: BrowserWindow.fromWebContents should work in browser-window-created (#33257)

Browse source
This commit is contained in:
Jeremy Rose 2022-03-16 16:23:14 -07:00 • committed by GitHub
parent b2c5623a13
commit e904486076
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/common/gin_helper/trackable_object.h
View file

@ -117,11 +117,11 @@ class TrackableObject : public TrackableObjectBase, public EventEmitter<T> {
~TrackableObject() override { RemoveFromWeakMap(); } ~TrackableObject() override { RemoveFromWeakMap(); }
void InitWith(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) override { void InitWith(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) override {
gin_helper::WrappableBase::InitWith(isolate, wrapper);
if (!weak_map_) { if (!weak_map_) {
weak_map_ = new electron::KeyWeakMap<int32_t>; weak_map_ = new electron::KeyWeakMap<int32_t>;
} }
weak_map_->Set(isolate, weak_map_id_, wrapper); weak_map_->Set(isolate, weak_map_id_, wrapper);
gin_helper::WrappableBase::InitWith(isolate, wrapper);
} }
private: private:

12
spec-main/api-browser-window-spec.ts
View file

@ -1816,6 +1816,18 @@ describe('BrowserWindow module', () => {
expect(BrowserWindow.fromWebContents(webviewContents)!.id).to.equal(w.id); expect(BrowserWindow.fromWebContents(webviewContents)!.id).to.equal(w.id);
await p; 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()', () => { describe('BrowserWindow.openDevTools()', () => {