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

fix: properly free remote objects (#20671)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-10-22 16:54:38 -07:00 committed by GitHub
parent 97fa8c824c
commit cde2aae6b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shell/common/api/remote/remote_object_freer.cc
View file

@ -10,7 +10,7 @@
#include "electron/shell/common/api/api.mojom.h" #include "electron/shell/common/api/api.mojom.h"
#include "electron/shell/common/native_mate_converters/blink_converter.h" #include "electron/shell/common/native_mate_converters/blink_converter.h"
#include "electron/shell/common/native_mate_converters/value_converter.h" #include "electron/shell/common/native_mate_converters/value_converter.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_local_frame.h"
using blink::WebLocalFrame; using blink::WebLocalFrame;
@ -82,8 +82,8 @@ void RemoteObjectFreer::RunDestructor() {
ref_mapper_.erase(objects_it); ref_mapper_.erase(objects_it);
} }
mojom::ElectronBrowserAssociatedPtr electron_ptr; mojom::ElectronBrowserPtr electron_ptr;
render_frame->GetRemoteAssociatedInterfaces()->GetInterface( render_frame->GetRemoteInterfaces()->GetInterface(
mojo::MakeRequest(&electron_ptr)); mojo::MakeRequest(&electron_ptr));
electron_ptr->DereferenceRemoteJSObject(context_id_, object_id_, ref_count); electron_ptr->DereferenceRemoteJSObject(context_id_, object_id_, ref_count);
} }