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

Merge pull request #7157 from Mossop/moveguest

Browse source 
Allow moving a webcontents to a different webview
This commit is contained in:
Cheng Zhao 2016-09-20 14:28:42 +09:00 • committed by GitHub
commit e3e450613d
12 changed files with 424 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/renderer/api/atom_api_web_frame.cc
View file

@ -110,6 +110,10 @@ void WebFrame::AttachGuest(int id) {
content::RenderFrame::FromWebFrame(web_frame_)->AttachGuest(id);
}
void WebFrame::DetachGuest(int id) {
content::RenderFrame::FromWebFrame(web_frame_)->DetachGuest(id);
}
void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
const std::string& language,
bool auto_spell_correct_turned_on,
@ -202,6 +206,7 @@ void WebFrame::BuildPrototype(
.SetMethod("registerElementResizeCallback",
&WebFrame::RegisterElementResizeCallback)
.SetMethod("attachGuest", &WebFrame::AttachGuest)
.SetMethod("detachGuest", &WebFrame::DetachGuest)
.SetMethod("setSpellCheckProvider", &WebFrame::SetSpellCheckProvider)
.SetMethod("registerURLSchemeAsSecure",
&WebFrame::RegisterURLSchemeAsSecure)

1
atom/renderer/api/atom_api_web_frame.h
View file

@ -53,6 +53,7 @@ class WebFrame : public mate::Wrappable<WebFrame> {
int element_instance_id,
const GuestViewContainer::ResizeCallback& callback);
void AttachGuest(int element_instance_id);
void DetachGuest(int element_instance_id);
// Set the provider that will be used by SpellCheckClient for spell check.
void SetSpellCheckProvider(mate::Arguments* args,