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

Fix double freeing WebContents

Browse source
This commit is contained in:
Cheng Zhao 2014-11-03 19:45:09 +08:00
parent cf9f249f07
commit 1731d609b7
2 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/api/atom_api_web_contents.cc
View file

@ -58,12 +58,9 @@ WebContents::WebContents(const mate::Dictionary& options)
if (options.Get("isGuest", &is_guest) && is_guest)
params.guest_delegate = this;
storage_.reset(content::WebContents::Create(params));
storage_->SetDelegate(this);
Observe(storage_.get());
inspectable_web_contents_.reset(
brightray::InspectableWebContents::Create(storage_.get()));
storage_.reset(brightray::InspectableWebContents::Create(params));
Observe(storage_->GetWebContents());
web_contents()->SetDelegate(this);
}
WebContents::~WebContents() {
@ -375,10 +372,10 @@ void WebContents::ExecuteJavaScript(const base::string16& code) {
}
void WebContents::OpenDevTools() {
inspectable_web_contents()->ShowDevTools();
storage_->ShowDevTools();
// force the inspectable web contents to be undocked when it is opened.
inspectable_web_contents()->GetView()->SetIsDocked(false);
// Force the inspectable web contents to be undocked when it is opened.
storage_->GetView()->SetIsDocked(false);
}
bool WebContents::SendIPCMessage(const base::string16& channel,