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

Don't rely on process_id to search for NativeWindow

Browse source
This commit is contained in:
Cheng Zhao 2015-06-03 14:08:56 +08:00
parent 6dfa7b5383
commit d4be2da70e
7 changed files with 36 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/web_view_manager.h
View file

@ -29,13 +29,9 @@ class WebViewManager : public content::BrowserPluginGuestManager {
base::FilePath preload_script;
};
// Finds the WebViewManager attached with |process| and returns the
// Finds the WebViewManager attached with |web_contents| and returns the
// WebViewInfo of it.
static bool GetInfoForProcess(content::RenderProcessHost* process,
WebViewInfo* info);
// Same with GetInfoForProcess but search for |web_contents| instead.
static bool GetInfoForWebContents(content::WebContents* web_contents,
static bool GetInfoForWebContents(const content::WebContents* web_contents,
WebViewInfo* info);
explicit WebViewManager(content::BrowserContext* context);
@ -85,7 +81,7 @@ class WebViewManager : public content::BrowserPluginGuestManager {
// (embedder_process_id, element_instance_id) => guest_instance_id
std::map<ElementInstanceKey, int> element_instance_id_to_guest_map_;
typedef std::map<content::WebContents*, WebViewInfo> WebViewInfoMap;
typedef std::map<const content::WebContents*, WebViewInfo> WebViewInfoMap;
// web_contents => (guest_instance_id, embedder, ...)
WebViewInfoMap webview_info_map_;