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

Fix API changes

Browse source
This commit is contained in:
Cheng Zhao 2015-04-21 18:56:08 +08:00
parent 32f0ae5b50
commit b37c73436b
13 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/web_view_manager.cc
View file

@ -42,7 +42,8 @@ void WebViewManager::AddGuest(int guest_instance_id,
webview_info_map_[guest_process_id] = info;
// Map the element in embedder to guest.
ElementInstanceKey key(embedder, element_instance_id);
int owner_process_id = embedder->GetRenderProcessHost()->GetID();
ElementInstanceKey key(owner_process_id, element_instance_id);
element_instance_id_to_guest_map_[key] = guest_instance_id;
}
@ -76,9 +77,9 @@ bool WebViewManager::GetInfo(int guest_process_id, WebViewInfo* webview_info) {
}
content::WebContents* WebViewManager::GetGuestByInstanceID(
content::WebContents* embedder,
int owner_process_id,
int element_instance_id) {
ElementInstanceKey key(embedder, element_instance_id);
ElementInstanceKey key(owner_process_id, element_instance_id);
if (!ContainsKey(element_instance_id_to_guest_map_, key))
return nullptr;