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

feat: add senderIsMainFrame to messages sent via ipcRenderer.sendTo() (#38868)

Browse source 
* feat: add isMainFrame to events emitted via ipcRenderer.sendTo()

* chore: rename isMainFrame to senderIsMainFrame
This commit is contained in:
Milan Burda 2023-07-24 14:27:30 +02:00 • committed by GitHub
parent 09e6e4b9a7
commit 3df6d337f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 71 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
shell/renderer/electron_api_service_impl.cc
View file

@ -83,7 +83,8 @@ void EmitIPCEvent(v8::Local<v8::Context> context,
const std::string& channel,
std::vector<v8::Local<v8::Value>> ports,
v8::Local<v8::Value> args,
int32_t sender_id) {
int32_t sender_id = 0,
bool sender_is_main_frame = false) {
auto* isolate = context->GetIsolate();
v8::HandleScope handle_scope(isolate);
@ -92,9 +93,12 @@ void EmitIPCEvent(v8::Local<v8::Context> context,
v8::MicrotasksScope::kRunMicrotasks);
std::vector<v8::Local<v8::Value>> argv = {
gin::ConvertToV8(isolate, internal), gin::ConvertToV8(isolate, channel),
gin::ConvertToV8(isolate, ports), args,
gin::ConvertToV8(isolate, sender_id)};
gin::ConvertToV8(isolate, internal),
gin::ConvertToV8(isolate, channel),
gin::ConvertToV8(isolate, ports),
args,
gin::ConvertToV8(isolate, sender_id),
gin::ConvertToV8(isolate, sender_is_main_frame)};
InvokeIpcCallback(context, "onMessage", argv);
}
@ -157,7 +161,8 @@ void ElectronApiServiceImpl::OnConnectionError() {
void ElectronApiServiceImpl::Message(bool internal,
const std::string& channel,
blink::CloneableMessage arguments,
int32_t sender_id) {
int32_t sender_id,
bool sender_is_main_frame) {
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
if (!frame)
return;
@ -170,7 +175,8 @@ void ElectronApiServiceImpl::Message(bool internal,
v8::Local<v8::Value> args = gin::ConvertToV8(isolate, arguments);
EmitIPCEvent(context, internal, channel, {}, args, sender_id);
EmitIPCEvent(context, internal, channel, {}, args, sender_id,
sender_is_main_frame);
}
void ElectronApiServiceImpl::ReceivePostMessage(
@ -197,8 +203,7 @@ void ElectronApiServiceImpl::ReceivePostMessage(
std::vector<v8::Local<v8::Value>> args = {message_value};
EmitIPCEvent(context, false, channel, ports, gin::ConvertToV8(isolate, args),
0);
EmitIPCEvent(context, false, channel, ports, gin::ConvertToV8(isolate, args));
}
void ElectronApiServiceImpl::TakeHeapSnapshot(