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

Don't load URL if web contents is destroyed

Browse source
This commit is contained in:
Kevin Sawicki 2016-12-20 16:51:03 -08:00
parent 095f304d7d
commit 1308f790ad
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -439,6 +439,11 @@ content::WebContents* WebContents::OpenURLFromTab(
if (Emit("will-navigate", params.url)) if (Emit("will-navigate", params.url))
return nullptr; return nullptr;
// Don't load the URL if the web contents was marked as destroyed from a
// will-navigate event listener
if (IsDestroyed())
return nullptr;
return CommonWebContentsDelegate::OpenURLFromTab(source, params); return CommonWebContentsDelegate::OpenURLFromTab(source, params);
} }

6
atom/browser/api/trackable_object.h
View file

@ -65,6 +65,12 @@ class TrackableObject : public TrackableObjectBase,
Wrappable<T>::GetWrapper()->SetAlignedPointerInInternalField(0, nullptr); Wrappable<T>::GetWrapper()->SetAlignedPointerInInternalField(0, nullptr);
} }
bool IsDestroyed() {
v8::Local<v8::Object> wrapper = Wrappable<T>::GetWrapper();
return wrapper->InternalFieldCount() == 0 ||
wrapper->GetAlignedPointerFromInternalField(0) == nullptr;
}
// Finds out the TrackableObject from its ID in weak map. // Finds out the TrackableObject from its ID in weak map.
static T* FromWeakMapID(v8::Isolate* isolate, int32_t id) { static T* FromWeakMapID(v8::Isolate* isolate, int32_t id) {
if (!weak_map_) if (!weak_map_)