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

Don't leak listeners in embedder when guest is destroyed

Browse source
This commit is contained in:
Cheng Zhao 2014-12-17 20:44:15 -08:00
parent a26091e485
commit da54ac5f55
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -274,6 +274,9 @@ void WebContents::Destroy() {
if (!destruction_callback_.is_null()) if (!destruction_callback_.is_null())
destruction_callback_.Run(); destruction_callback_.Run();
// When force destroying the "destroyed" event is not emitted.
WebContentsDestroyed();
Observe(nullptr); Observe(nullptr);
storage_.reset(); storage_.reset();
} }

4
atom/browser/lib/guest-view-manager.coffee
View file

@ -40,9 +40,9 @@ createGuest = (embedder, params) ->
destroyEvents = ['destroyed', 'crashed', 'did-navigate-to-different-page'] destroyEvents = ['destroyed', 'crashed', 'did-navigate-to-different-page']
destroy = -> destroy = ->
destroyGuest id if guestInstances[id]? destroyGuest id if guestInstances[id]?
embedder.removeListener event, destroy for event in destroyEvents
embedder.setMaxListeners 100 # we can have lots of <webview> in one page.
embedder.once event, destroy for event in destroyEvents embedder.once event, destroy for event in destroyEvents
guest.once 'destroyed', ->
embedder.removeListener event, destroy for event in destroyEvents
# Init guest web view after attached. # Init guest web view after attached.
guest.once 'did-attach', -> guest.once 'did-attach', ->

1
atom/renderer/lib/web-view/web-view.coffee
View file

@ -50,7 +50,6 @@ class WebViewImpl
# heard back from createGuest yet. We will not reset the flag in this case so # heard back from createGuest yet. We will not reset the flag in this case so
# that we don't end up allocating a second guest. # that we don't end up allocating a second guest.
if @guestInstanceId if @guestInstanceId
# FIXME
guestViewInternal.destroyGuest @guestInstanceId guestViewInternal.destroyGuest @guestInstanceId
@guestInstanceId = undefined @guestInstanceId = undefined
@beforeFirstNavigation = true @beforeFirstNavigation = true