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

Be safe on lifetime of webContents.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-25 11:22:51 +08:00
parent b02bcc0016
commit 9eeec9aa0b
3 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,11 +17,20 @@ namespace api {
WebContents::WebContents(content::WebContents* web_contents)
: web_contents_(web_contents) {
Observe(web_contents_);
}
WebContents::~WebContents() {
}
void WebContents::WebContentsDestroyed(content::WebContents*) {
web_contents_ = NULL;
}
bool WebContents::IsAlive() const {
return web_contents_ != NULL;
}
GURL WebContents::GetURL() const {
return web_contents_->GetURL();
}
@ -62,6 +71,7 @@ void WebContents::ExecuteJavaScript(const string16& code) {
mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
v8::Isolate* isolate) {
return mate::ObjectTemplateBuilder(isolate)
.SetMethod("isAlive", &WebContents::IsAlive)
.SetMethod("getUrl", &WebContents::GetURL)
.SetMethod("getTitle", &WebContents::GetTitle)
.SetMethod("isLoading", &WebContents::IsLoading)