Commit b702a6d8 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Gave 3 kMaxMessageChunkSize constants unique names.

There are three very similar pieces of code with identical
constants controlling and this patch renames them so
that they don't clash in jumbo builds.

Jumbo builds compile multiple cc files in the same translation
unit which means that those cc files will share the same
anonymous namespace.

Bug: 746953
Change-Id: I85462687798819212b78926c92d3351f44039583
Reviewed-on: https://chromium-review.googlesource.com/822474Reviewed-by: default avatarTsuyoshi Horo <horo@chromium.org>
Reviewed-by: default avatarDmitry Gozman <dgozman@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#523723}
parent 8620d3bf
......@@ -45,7 +45,7 @@ namespace {
// TODO(dgozman): somehow get this from a mojo config.
// See kMaximumMojoMessageSize in services/service_manager/embedder/main.cc.
const size_t kMaxMessageChunkSize = 128 * 1024 * 1024 / 4;
const size_t kMaxDevToolsMessageChunkSize = 128 * 1024 * 1024 / 4;
const char kPageGetAppManifest[] = "Page.getAppManifest";
class WebKitClientMessageLoopImpl
......@@ -321,16 +321,18 @@ void DevToolsAgent::SendChunkedProtocolMessage(int session_id,
if (it == hosts_.end())
return;
bool single_chunk = message.length() < kMaxMessageChunkSize;
for (size_t pos = 0; pos < message.length(); pos += kMaxMessageChunkSize) {
bool single_chunk = message.length() < kMaxDevToolsMessageChunkSize;
for (size_t pos = 0; pos < message.length();
pos += kMaxDevToolsMessageChunkSize) {
mojom::DevToolsMessageChunkPtr chunk = mojom::DevToolsMessageChunk::New();
chunk->is_first = pos == 0;
chunk->message_size = chunk->is_first ? message.size() : 0;
chunk->is_last = pos + kMaxMessageChunkSize >= message.length();
chunk->is_last = pos + kMaxDevToolsMessageChunkSize >= message.length();
chunk->call_id = chunk->is_last ? call_id : 0;
chunk->post_state = chunk->is_last ? std::move(post_state) : std::string();
chunk->data = single_chunk ? std::move(message)
: message.substr(pos, kMaxMessageChunkSize);
chunk->data = single_chunk
? std::move(message)
: message.substr(pos, kMaxDevToolsMessageChunkSize);
it->second->DispatchProtocolMessage(std::move(chunk));
}
}
......
......@@ -16,7 +16,8 @@ using blink::WebString;
namespace content {
namespace {
const size_t kMaxMessageChunkSize = IPC::Channel::kMaximumMessageSize / 4;
const size_t kMaxEmbeddedWorkerDevToolsMessageChunkSize =
IPC::Channel::kMaximumMessageSize / 4;
}
EmbeddedWorkerDevToolsAgent::EmbeddedWorkerDevToolsAgent(
......@@ -35,17 +36,22 @@ void EmbeddedWorkerDevToolsAgent::SendMessage(IPC::Sender* sender,
int call_id,
std::string message,
std::string state_cookie) {
bool single_chunk = message.length() < kMaxMessageChunkSize;
for (size_t pos = 0; pos < message.length(); pos += kMaxMessageChunkSize) {
bool single_chunk =
message.length() < kMaxEmbeddedWorkerDevToolsMessageChunkSize;
for (size_t pos = 0; pos < message.length();
pos += kMaxEmbeddedWorkerDevToolsMessageChunkSize) {
DevToolsMessageChunk chunk;
chunk.is_first = pos == 0;
chunk.message_size = pos == 0 ? message.size() : 0;
chunk.is_last = pos + kMaxMessageChunkSize >= message.length();
chunk.is_last =
pos + kMaxEmbeddedWorkerDevToolsMessageChunkSize >= message.length();
chunk.session_id = session_id;
chunk.call_id = chunk.is_last ? call_id : 0;
chunk.post_state = chunk.is_last ? std::move(state_cookie) : std::string();
chunk.data = single_chunk ? std::move(message)
: message.substr(pos, kMaxMessageChunkSize);
chunk.data =
single_chunk
? std::move(message)
: message.substr(pos, kMaxEmbeddedWorkerDevToolsMessageChunkSize);
sender->Send(new DevToolsClientMsg_DispatchOnInspectorFrontend(
route_id_, std::move(chunk)));
}
......
......@@ -17,7 +17,7 @@ using blink::WebString;
namespace content {
static const size_t kMaxMessageChunkSize =
static const size_t kMaxSharedWorkerDevToolsMessageChunkSize =
IPC::Channel::kMaximumMessageSize / 4;
SharedWorkerDevToolsAgent::SharedWorkerDevToolsAgent(
......@@ -55,7 +55,7 @@ void SharedWorkerDevToolsAgent::SendDevToolsMessage(
chunk.message_size = message.size();
chunk.is_first = true;
if (message.length() < kMaxMessageChunkSize) {
if (message.length() < kMaxSharedWorkerDevToolsMessageChunkSize) {
chunk.data.swap(message);
chunk.session_id = session_id;
chunk.call_id = call_id;
......@@ -66,12 +66,14 @@ void SharedWorkerDevToolsAgent::SendDevToolsMessage(
return;
}
for (size_t pos = 0; pos < message.length(); pos += kMaxMessageChunkSize) {
chunk.is_last = pos + kMaxMessageChunkSize >= message.length();
for (size_t pos = 0; pos < message.length();
pos += kMaxSharedWorkerDevToolsMessageChunkSize) {
chunk.is_last =
pos + kMaxSharedWorkerDevToolsMessageChunkSize >= message.length();
chunk.session_id = chunk.is_last ? session_id : 0;
chunk.call_id = chunk.is_last ? call_id : 0;
chunk.post_state = chunk.is_last ? post_state : std::string();
chunk.data = message.substr(pos, kMaxMessageChunkSize);
chunk.data = message.substr(pos, kMaxSharedWorkerDevToolsMessageChunkSize);
Send(new DevToolsClientMsg_DispatchOnInspectorFrontend(
route_id_, chunk));
chunk.is_first = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment