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

Check whether WebContents lives before using its methods

Browse source 
Close #2064.
This commit is contained in:
Cheng Zhao 2015-07-06 18:21:04 +08:00
parent 9cf09b8850
commit 54dac0f37a
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -792,6 +792,10 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_)); isolate, v8::Local<v8::ObjectTemplate>::New(isolate, template_));
} }
bool WebContents::IsDestroyed() const {
return !IsAlive();
}
void WebContents::OnRendererMessage(const base::string16& channel, void WebContents::OnRendererMessage(const base::string16& channel,
const base::ListValue& args) { const base::ListValue& args) {
// webContents.emit(channel, new Event(), args...); // webContents.emit(channel, new Event(), args...);

1
atom/browser/api/atom_api_web_contents.h
View file

@ -111,6 +111,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
// mate::Wrappable: // mate::Wrappable:
mate::ObjectTemplateBuilder GetObjectTemplateBuilder( mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
v8::Isolate* isolate) override; v8::Isolate* isolate) override;
bool IsDestroyed() const override;
// content::WebContentsDelegate: // content::WebContentsDelegate:
bool AddMessageToConsole(content::WebContents* source, bool AddMessageToConsole(content::WebContents* source,