78411db4b5
* spec: clean up after a failed window count assertion Previously when this assertion failed all tests that ran after the failed assertion also failed. This ensure that the assertion fails for the test that actually caused the issue but cleans up the left-over windows so that future tests do not fail. * fix: maintain a ref count for objects sent over remote Previously there was a race condition where a GC could occur in the renderer process between the main process sending a meta.id and the renderer pulling the proxy out its weakmap to stop it being GC'ed. This fixes that race condition by maintaining a "sent" ref count in the object registry and a "received" ref count in the object cache on the renderer side. The deref request now sends the number of refs the renderer thinks it owns, if the number does not match the value in the object registry it is assumed that there is an IPC message containing a new reference in flight and this race condition was hit. The browser side ref count is then reduced and we wait for the new deref message. This guaruntees that an object will only be removed from the registry if every reference we sent has been guarunteed to be unreffed.
86 lines
2.7 KiB
C++
86 lines
2.7 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "atom/common/api/remote_object_freer.h"
|
|
|
|
#include "atom/common/api/api_messages.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/values.h"
|
|
#include "content/public/renderer/render_frame.h"
|
|
#include "electron/atom/common/api/api.mojom.h"
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
|
#include "third_party/blink/public/web/web_local_frame.h"
|
|
|
|
using blink::WebLocalFrame;
|
|
|
|
namespace atom {
|
|
|
|
namespace {
|
|
|
|
content::RenderFrame* GetCurrentRenderFrame() {
|
|
WebLocalFrame* frame = WebLocalFrame::FrameForCurrentContext();
|
|
if (!frame)
|
|
return nullptr;
|
|
|
|
return content::RenderFrame::FromWebFrame(frame);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// static
|
|
void RemoteObjectFreer::BindTo(v8::Isolate* isolate,
|
|
v8::Local<v8::Object> target,
|
|
const std::string& context_id,
|
|
int object_id) {
|
|
new RemoteObjectFreer(isolate, target, context_id, object_id);
|
|
}
|
|
|
|
// static
|
|
void RemoteObjectFreer::AddRef(const std::string& context_id, int object_id) {
|
|
ref_mapper_[context_id][object_id]++;
|
|
}
|
|
|
|
// static
|
|
std::map<std::string, std::map<int, int>> RemoteObjectFreer::ref_mapper_;
|
|
|
|
RemoteObjectFreer::RemoteObjectFreer(v8::Isolate* isolate,
|
|
v8::Local<v8::Object> target,
|
|
const std::string& context_id,
|
|
int object_id)
|
|
: ObjectLifeMonitor(isolate, target),
|
|
context_id_(context_id),
|
|
object_id_(object_id),
|
|
routing_id_(MSG_ROUTING_NONE) {
|
|
content::RenderFrame* render_frame = GetCurrentRenderFrame();
|
|
if (render_frame) {
|
|
routing_id_ = render_frame->GetRoutingID();
|
|
}
|
|
}
|
|
|
|
RemoteObjectFreer::~RemoteObjectFreer() {}
|
|
|
|
void RemoteObjectFreer::RunDestructor() {
|
|
content::RenderFrame* render_frame =
|
|
content::RenderFrame::FromRoutingID(routing_id_);
|
|
if (!render_frame)
|
|
return;
|
|
|
|
auto* channel = "ELECTRON_BROWSER_DEREFERENCE";
|
|
base::ListValue args;
|
|
args.AppendString(context_id_);
|
|
args.AppendInteger(object_id_);
|
|
args.AppendInteger(ref_mapper_[context_id_][object_id_]);
|
|
// Reset our local ref count in case we are in a GC race condition and will
|
|
// get more references in an inbound IPC message
|
|
ref_mapper_[context_id_].erase(object_id_);
|
|
if (ref_mapper_[context_id_].empty())
|
|
ref_mapper_.erase(context_id_);
|
|
|
|
mojom::ElectronBrowserAssociatedPtr electron_ptr;
|
|
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
|
mojo::MakeRequest(&electron_ptr));
|
|
electron_ptr->Message(true, channel, args.Clone());
|
|
}
|
|
|
|
} // namespace atom
|