Skip to content

Commit

Permalink
rename some methods for clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
nornagon committed Feb 28, 2020
1 parent 9ee147a commit 6a9a57a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
11 changes: 6 additions & 5 deletions shell/browser/api/electron_api_web_contents.cc
Expand Up @@ -1095,16 +1095,16 @@ 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<v8::Value> message_value =
electron::DeserializeV8Value(isolate(), message);
EmitWithSender("-ipc-ports", bindings_.dispatch_context(), InvokeCallback(),
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();
Expand Down Expand Up @@ -1141,7 +1141,8 @@ void WebContents::PostIPCMessage(gin::Arguments* args) {
content::RenderFrameHost* frame_host = web_contents()->GetMainFrame();
mojo::AssociatedRemote<mojom::ElectronRenderer> 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,
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions shell/browser/api/electron_api_web_contents.h
Expand Up @@ -526,8 +526,8 @@ class WebContents : public gin_helper::TrackableObject<WebContents>,
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,
Expand Down
4 changes: 2 additions & 2 deletions shell/common/api/api.mojom
Expand Up @@ -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);

Expand Down Expand Up @@ -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.
Expand Down
5 changes: 3 additions & 2 deletions shell/renderer/electron_api_service_impl.cc
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions shell/renderer/electron_api_service_impl.h
Expand Up @@ -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;
Expand Down

0 comments on commit 6a9a57a

Please sign in to comment.