github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Store NativeWindow's weak ptr in WebContents

Browse Source
This commit is contained in:
Cheng Zhao
2015-06-24 22:14:46 +08:00
parent 2532318bee
commit 2bfa9da82e
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
atom/browser/api/atom_api_web_contents.cc
View File

@@ -177,8 +177,11 @@ WebContents::WebContents(const mate::Dictionary& options)
NativeWindow* owner_window = nullptr;
WebContents* embedder = nullptr;
if (options.Get("embedder", &embedder) && embedder)
owner_window = NativeWindow::FromWebContents(embedder->web_contents());
if (options.Get("embedder", &embedder) && embedder) {
auto relay = NativeWindowRelay::FromWebContents(embedder->web_contents());
if (relay)
owner_window = relay->window.get();
}
AttachAsUserData(web_contents);
InitWithWebContents(web_contents, owner_window);