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

Update WebViewRendererState immediately

Browse source
This commit is contained in:
Cheng Zhao 2015-02-04 12:59:46 -08:00
parent 3490ce507a
commit aa49e4790f
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
atom/browser/web_view/web_view_manager.cc
View file

@ -10,7 +10,6 @@
#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
@ -71,13 +70,9 @@ void WebViewManager::AddGuest(int guest_instance_id,
options.disable_web_security, options.disable_web_security,
}; };
net::FileURLToFilePath(options.preload_url, &web_view_info.preload_script); net::FileURLToFilePath(options.preload_url, &web_view_info.preload_script);
content::BrowserThread::PostTask( WebViewRendererState::GetInstance()->AddGuest(
content::BrowserThread::IO,
FROM_HERE,
base::Bind(&WebViewRendererState::AddGuest,
base::Unretained(WebViewRendererState::GetInstance()),
web_contents->GetRenderProcessHost()->GetID(), web_contents->GetRenderProcessHost()->GetID(),
web_view_info)); web_view_info);
// Map the element in embedder to guest. // Map the element in embedder to guest.
ElementInstanceKey key(embedder, element_instance_id); ElementInstanceKey key(embedder, element_instance_id);
@ -90,13 +85,8 @@ void WebViewManager::RemoveGuest(int guest_instance_id) {
} }
auto web_contents = web_contents_map_[guest_instance_id].web_contents; auto web_contents = web_contents_map_[guest_instance_id].web_contents;
WebViewRendererState::GetInstance()->RemoveGuest(
content::BrowserThread::PostTask( web_contents->GetRenderProcessHost()->GetID());
content::BrowserThread::IO, FROM_HERE,
base::Bind(
&WebViewRendererState::RemoveGuest,
base::Unretained(WebViewRendererState::GetInstance()),
web_contents->GetRenderProcessHost()->GetID()));
web_contents_map_.erase(guest_instance_id); web_contents_map_.erase(guest_instance_id);