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

Fix crash when using webview

Browse source
This commit is contained in:
Cheng Zhao 2017-01-25 10:44:58 +09:00 • committed by Kevin Sawicki
parent c72438f09f
commit 09fcb7fb27
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/web_view_guest_delegate.cc
View file

@ -151,4 +151,16 @@ gfx::Size WebViewGuestDelegate::GetDefaultSize() const {
} }
} }
bool WebViewGuestDelegate::CanBeEmbeddedInsideCrossProcessFrames() {
return true;
}
content::RenderWidgetHost* WebViewGuestDelegate::GetOwnerRenderWidgetHost() {
return embedder_web_contents_->GetRenderViewHost()->GetWidget();
}
content::SiteInstance* WebViewGuestDelegate::GetOwnerSiteInstance() {
return embedder_web_contents_->GetSiteInstance();
}
} // namespace atom } // namespace atom

3
atom/browser/web_view_guest_delegate.h
View file

@ -59,6 +59,9 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
int element_instance_id, int element_instance_id,
bool is_full_page_plugin, bool is_full_page_plugin,
const base::Closure& completion_callback) final; const base::Closure& completion_callback) final;
bool CanBeEmbeddedInsideCrossProcessFrames() override;
content::RenderWidgetHost* GetOwnerRenderWidgetHost() override;
content::SiteInstance* GetOwnerSiteInstance() override;
private: private:
// This method is invoked when the contents auto-resized to give the container // This method is invoked when the contents auto-resized to give the container