Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: content/browser/message_port_service.cc

Issue 1974613002: Remove code that was only used by navigator.connect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comment Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/message_port_service.cc
diff --git a/content/browser/message_port_service.cc b/content/browser/message_port_service.cc
index 5ced952a4579feef3baf2a69c62c271f1e2ce744..d0e1c1f70a41f0e45750a55064bb571cbcc879e7 100644
--- a/content/browser/message_port_service.cc
+++ b/content/browser/message_port_service.cc
@@ -151,8 +151,8 @@ void MessagePortService::Entangle(int local_message_port_id,
void MessagePortService::PostMessage(
int sender_message_port_id,
- const MessagePortMessage& message,
- const std::vector<TransferredMessagePort>& sent_message_ports) {
+ const base::string16& message,
+ const std::vector<int>& sent_message_ports) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (!message_ports_.count(sender_message_port_id)) {
NOTREACHED();
@@ -174,14 +174,14 @@ void MessagePortService::PostMessage(
void MessagePortService::PostMessageTo(
int message_port_id,
- const MessagePortMessage& message,
- const std::vector<TransferredMessagePort>& sent_message_ports) {
+ const base::string16& message,
+ const std::vector<int>& sent_message_ports) {
if (!message_ports_.count(message_port_id)) {
NOTREACHED();
return;
}
for (size_t i = 0; i < sent_message_ports.size(); ++i) {
- if (!message_ports_.count(sent_message_ports[i].id)) {
+ if (!message_ports_.count(sent_message_ports[i])) {
NOTREACHED();
return;
}
@@ -194,7 +194,7 @@ void MessagePortService::PostMessageTo(
// put in this state.
if (entangled_port.hold_messages_for_destination) {
for (const auto& port : sent_message_ports)
- HoldMessages(port.id);
+ HoldMessages(port);
}
entangled_port.queued_messages.push_back(
std::make_pair(message, sent_message_ports));
@@ -244,8 +244,8 @@ void MessagePortService::SendQueuedMessages(
// all ports in messages being sent to the port should also be put on hold.
if (port.hold_messages_for_destination) {
for (const auto& message : queued_messages)
- for (const TransferredMessagePort& sent_port : message.second)
- HoldMessages(sent_port.id);
+ for (int sent_port : message.second)
+ HoldMessages(sent_port);
}
port.queued_messages.insert(port.queued_messages.begin(),
@@ -285,8 +285,8 @@ void MessagePortService::HoldMessages(int message_port_id) {
// Any ports in messages currently in the queue should also be put on hold.
for (const auto& message : message_ports_[message_port_id].queued_messages)
- for (const TransferredMessagePort& sent_port : message.second)
- HoldMessages(sent_port.id);
+ for (int sent_port : message.second)
+ HoldMessages(sent_port);
message_ports_[message_port_id].hold_messages_for_destination = true;
}
@@ -312,8 +312,8 @@ void MessagePortService::ClosePort(int message_port_id) {
// First close any message ports in the queue for this message port.
for (const auto& message : message_ports_[message_port_id].queued_messages)
- for (const TransferredMessagePort& sent_port : message.second)
- ClosePort(sent_port.id);
+ for (int sent_port : message.second)
+ ClosePort(sent_port);
Erase(message_port_id);
}
« no previous file with comments | « content/browser/message_port_service.h ('k') | content/browser/service_worker/service_worker_dispatcher_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698