diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index 40591aa190372..cc9e29c8812fd 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -1095,8 +1095,8 @@ void WebContents::Invoke(bool internal, std::move(callback), internal, channel, std::move(arguments)); } -void WebContents::PostMessage(const std::string& channel, - blink::TransferableMessage message) { +void WebContents::ReceivePostMessage(const std::string& channel, + blink::TransferableMessage message) { auto wrapped_ports = MessagePort::EntanglePorts(isolate(), message.ports); v8::Local message_value = electron::DeserializeV8Value(isolate(), message); @@ -1104,7 +1104,7 @@ void WebContents::PostMessage(const std::string& channel, false, channel, message_value, std::move(wrapped_ports)); } -void WebContents::PostIPCMessage(gin::Arguments* args) { +void WebContents::PostMessage(gin::Arguments* args) { std::string channel; if (!args->GetNext(&channel)) { args->ThrowError(); @@ -1141,7 +1141,8 @@ void WebContents::PostIPCMessage(gin::Arguments* args) { content::RenderFrameHost* frame_host = web_contents()->GetMainFrame(); mojo::AssociatedRemote electron_renderer; frame_host->GetRemoteAssociatedInterfaces()->GetInterface(&electron_renderer); - electron_renderer->PostMessage(channel, std::move(transferable_message)); + electron_renderer->ReceivePostMessage(channel, + std::move(transferable_message)); } void WebContents::MessageSync(bool internal, @@ -2700,7 +2701,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate, .SetMethod("isFocused", &WebContents::IsFocused) .SetMethod("tabTraverse", &WebContents::TabTraverse) .SetMethod("_send", &WebContents::SendIPCMessage) - .SetMethod("_postMessage", &WebContents::PostIPCMessage) + .SetMethod("_postMessage", &WebContents::PostMessage) .SetMethod("_sendToFrame", &WebContents::SendIPCMessageToFrame) .SetMethod("sendInputEvent", &WebContents::SendInputEvent) .SetMethod("beginFrameSubscription", &WebContents::BeginFrameSubscription) diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h index e1f5b84dc0f0a..134753b22b336 100644 --- a/shell/browser/api/electron_api_web_contents.h +++ b/shell/browser/api/electron_api_web_contents.h @@ -526,8 +526,8 @@ class WebContents : public gin_helper::TrackableObject, const std::string& channel, blink::CloneableMessage arguments, InvokeCallback callback) override; - void PostMessage(const std::string& channel, - blink::TransferableMessage message) override; + void ReceivePostMessage(const std::string& channel, + blink::TransferableMessage message) override; void MessageSync(bool internal, const std::string& channel, blink::CloneableMessage arguments, diff --git a/shell/common/api/api.mojom b/shell/common/api/api.mojom index ee2cb92f9bce5..95f802f9a1b26 100644 --- a/shell/common/api/api.mojom +++ b/shell/common/api/api.mojom @@ -13,7 +13,7 @@ interface ElectronRenderer { blink.mojom.CloneableMessage arguments, int32 sender_id); - PostMessage(string channel, blink.mojom.TransferableMessage message); + ReceivePostMessage(string channel, blink.mojom.TransferableMessage message); UpdateCrashpadPipeName(string pipe_name); @@ -56,7 +56,7 @@ interface ElectronBrowser { string channel, blink.mojom.CloneableMessage arguments) => (blink.mojom.CloneableMessage result); - PostMessage(string channel, blink.mojom.TransferableMessage message); + ReceivePostMessage(string channel, blink.mojom.TransferableMessage message); // Emits an event on |channel| from the ipcMain JavaScript object in the main // process, and waits synchronously for a response. diff --git a/shell/renderer/electron_api_service_impl.cc b/shell/renderer/electron_api_service_impl.cc index 63642f4e857e7..daa6ad3140d9f 100644 --- a/shell/renderer/electron_api_service_impl.cc +++ b/shell/renderer/electron_api_service_impl.cc @@ -181,8 +181,9 @@ void ElectronApiServiceImpl::Message(bool internal, } } -void ElectronApiServiceImpl::PostMessage(const std::string& channel, - blink::TransferableMessage message) { +void ElectronApiServiceImpl::ReceivePostMessage( + const std::string& channel, + blink::TransferableMessage message) { blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); if (!frame) return; diff --git a/shell/renderer/electron_api_service_impl.h b/shell/renderer/electron_api_service_impl.h index 4919d4e36fb4e..766a29b776cea 100644 --- a/shell/renderer/electron_api_service_impl.h +++ b/shell/renderer/electron_api_service_impl.h @@ -33,8 +33,8 @@ class ElectronApiServiceImpl : public mojom::ElectronRenderer, const std::string& channel, blink::CloneableMessage arguments, int32_t sender_id) override; - void PostMessage(const std::string& channel, - blink::TransferableMessage message) override; + void ReceivePostMessage(const std::string& channel, + blink::TransferableMessage message) override; #if BUILDFLAG(ENABLE_REMOTE_MODULE) void DereferenceRemoteJSCallback(const std::string& context_id, int32_t object_id) override;