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

fixup! Use strong ownership for attached inner WebContents

Browse source
This commit is contained in:
deepak1556 2019-01-10 21:54:43 +05:30 committed by Jeremy Apthorp
parent 374406375b
commit 06a5ade3c6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/web_view_guest_delegate.cc
View file

@ -38,11 +38,12 @@ void WebViewGuestDelegate::AttachToIframe(
DCHECK_EQ(embedder_web_contents_, DCHECK_EQ(embedder_web_contents_,
content::WebContents::FromRenderFrameHost(embedder_frame)); content::WebContents::FromRenderFrameHost(embedder_frame));
content::WebContents* guest_web_contents = api_web_contents_->web_contents();
// Attach this inner WebContents |guest_web_contents| to the outer // Attach this inner WebContents |guest_web_contents| to the outer
// WebContents |embedder_web_contents|. The outer WebContents's // WebContents |embedder_web_contents|. The outer WebContents's
// frame |embedder_frame| hosts the inner WebContents. // frame |embedder_frame| hosts the inner WebContents.
api_web_contents_->web_contents()->AttachToOuterWebContentsFrame( guest_web_contents->AttachToOuterWebContentsFrame(
base::WrapUnique<content::WebContents>(embedder_web_contents_), base::WrapUnique<content::WebContents>(guest_web_contents),
embedder_frame); embedder_frame);
ResetZoomController(); ResetZoomController();