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

7
shell/browser/api/electron_api_web_contents.cc
View file

@ -2031,7 +2031,8 @@ void WebContents::MessageSync(
void WebContents::MessageTo(int32_t web_contents_id,
const std::string& channel,
blink::CloneableMessage arguments) {
blink::CloneableMessage arguments,
content::RenderFrameHost* render_frame_host) {
TRACE_EVENT1("electron", "WebContents::MessageTo", "channel", channel);
auto* target_web_contents = FromID(web_contents_id);
@ -2047,8 +2048,10 @@ void WebContents::MessageTo(int32_t web_contents_id,
return;
int32_t sender_id = ID();
bool sender_is_main_frame = render_frame_host->GetParent() == nullptr;
web_frame_main->GetRendererApi()->Message(false /* internal */, channel,
std::move(arguments), sender_id);
std::move(arguments), sender_id,
sender_is_main_frame);
}
}

3
shell/browser/api/electron_api_web_contents.h
View file

@ -431,7 +431,8 @@ class WebContents : public ExclusiveAccessContext,
content::RenderFrameHost* render_frame_host);
void MessageTo(int32_t web_contents_id,
const std::string& channel,
blink::CloneableMessage arguments);
blink::CloneableMessage arguments,
content::RenderFrameHost* render_frame_host);
void MessageHost(const std::string& channel,
blink::CloneableMessage arguments,
content::RenderFrameHost* render_frame_host);

3
shell/browser/api/electron_api_web_frame_main.cc
View file

@ -185,7 +185,8 @@ void WebFrameMain::Send(v8::Isolate* isolate,
return;
GetRendererApi()->Message(internal, channel, std::move(message),
0 /* sender_id */);
0 /* sender_id */,
false /* sender_is_main_frame */);
}
const mojo::Remote<mojom::ElectronRenderer>& WebFrameMain::GetRendererApi() {

3
shell/browser/electron_api_ipc_handler_impl.cc
View file

@ -81,7 +81,8 @@ void ElectronApiIPCHandlerImpl::MessageTo(int32_t web_contents_id,
blink::CloneableMessage arguments) {
api::WebContents* api_web_contents = api::WebContents::From(web_contents());
if (api_web_contents) {
api_web_contents->MessageTo(web_contents_id, channel, std::move(arguments));
api_web_contents->MessageTo(web_contents_id, channel, std::move(arguments),
GetRenderFrameHost());
}
}

3
shell/common/api/api.mojom
View file

@ -10,7 +10,8 @@ interface ElectronRenderer {
bool internal,
string channel,
blink.mojom.CloneableMessage arguments,
int32 sender_id);
int32 sender_id,
bool sender_is_main_frame);
ReceivePostMessage(string channel, blink.mojom.TransferableMessage message);

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(

3
shell/renderer/electron_api_service_impl.h
View file

@ -35,7 +35,8 @@ class ElectronApiServiceImpl : public mojom::ElectronRenderer,
void Message(bool internal,
const std::string& channel,
blink::CloneableMessage arguments,
int32_t sender_id) override;
int32_t sender_id,
bool sender_is_main_frame) override;
void ReceivePostMessage(const std::string& channel,
blink::TransferableMessage message) override;
void TakeHeapSnapshot(mojo::ScopedHandle file,