Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CodeHealth] Replace blink::StringBuilder with blink::StrCat part 1 (#31029)

Browse Source 
[CodeHealth] Replace blink::StringBuilder with blink::StrCat part 1
This commit is contained in:
Darnell Andries
2025-09-16 08:38:54 -07:00
committed by GitHub
parent 7803dbcc2b
commit ec4a5aa199
20 changed files with 73 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc
Vendored
+4 -7
View File
@@ -15,7 +15,7 @@
#include "third_party/blink/renderer/core/page/plugin_data.h"
#include "third_party/blink/renderer/modules/plugins/dom_plugin.h"
#include "third_party/blink/renderer/platform/graphics/color.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
#include "third_party/blink/renderer/platform/wtf/vector.h"
using blink::DOMPlugin;
@@ -27,7 +27,7 @@ using blink::Member;
using blink::MimeClassInfo;
using blink::PluginData;
using blink::PluginInfo;
using blink::StringBuilder;
using blink::StrCat;
using WTF::String;
namespace brave {
@@ -45,11 +45,8 @@ String PluginReplacementName(FarblingPRNG* prng) {
"com.adobe.pdf "};
std::vector<String> viewer{"Viewer", "Renderer", "Display", "Plugin",
"plug-in", "plug in", "extension", ""};
StringBuilder result;
result.Append(chrome[(*prng)() % chrome.size()]);
result.Append(pdf[(*prng)() % pdf.size()]);
result.Append(viewer[(*prng)() % viewer.size()]);
return result.ToString();
return StrCat({chrome[(*prng)() % chrome.size()], pdf[(*prng)() % pdf.size()],
viewer[(*prng)() % viewer.size()]});
}
// General helper to add a mime type to a plugin info, with a single extension
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute.cc
Vendored
+2 -4
View File
@@ -9,7 +9,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_element.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/types.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -27,9 +27,7 @@ EdgeAttribute::EdgeAttribute(GraphItemContext* context,
EdgeAttribute::~EdgeAttribute() = default;
ItemDesc EdgeAttribute::GetItemDesc() const {
blink::StringBuilder ts;
ts << GraphEdge::GetItemDesc() << " [" << name_ << "]";
return ts.ReleaseString();
return blink::StrCat({GraphEdge::GetItemDesc(), " [", name_, "]"});
}
void EdgeAttribute::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute_set.cc
Vendored
+3 -5
View File
@@ -7,7 +7,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/types.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -28,10 +28,8 @@ ItemName EdgeAttributeSet::GetItemName() const {
}
ItemDesc EdgeAttributeSet::GetItemDesc() const {
blink::StringBuilder ts;
ts << EdgeAttribute::GetItemDesc() << " [" << GetName() << "=" << value_
<< "]";
return ts.ReleaseString();
return blink::StrCat(
{EdgeAttribute::GetItemDesc(), " [", GetName(), "=", value_, "]"});
}
void EdgeAttributeSet::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/edge_text_change.cc
Vendored
+2 -4
View File
@@ -8,7 +8,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/actor/node_script.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_text.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -23,9 +23,7 @@ ItemName EdgeTextChange::GetItemName() const {
}
ItemName EdgeTextChange::GetItemDesc() const {
blink::StringBuilder ts;
ts << GraphEdge::GetItemDesc() << " [" << text_ << "]";
return ts.ReleaseString();
return blink::StrCat({GraphEdge::GetItemDesc(), " [", text_, "]"});
}
void EdgeTextChange::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener.cc
Vendored
+4 -5
View File
@@ -8,7 +8,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/actor/node_actor.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_element.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -28,10 +28,9 @@ ItemName EdgeEventListener::GetItemName() const {
}
ItemDesc EdgeEventListener::GetItemDesc() const {
blink::StringBuilder ts;
ts << GraphEdge::GetItemDesc() << " [" << event_type_ << "]"
<< " [listener id: " << listener_id_ << "]";
return ts.ReleaseString();
return blink::StrCat({GraphEdge::GetItemDesc(), " [", event_type_, "]",
" [listener id: ", blink::String::Number(listener_id_),
"]"});
}
void EdgeEventListener::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener_action.cc
Vendored
+6 -6
View File
@@ -10,7 +10,8 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_element.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/types.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace brave_page_graph {
@@ -38,11 +39,10 @@ ScriptId EdgeEventListenerAction::GetListenerScriptId() const {
}
ItemDesc EdgeEventListenerAction::GetItemDesc() const {
blink::StringBuilder ts;
ts << GraphEdge::GetItemDesc() << " [" << event_type_ << "]"
<< " [listener id: " << listener_id_ << "]"
<< " [listener script id: " << GetListenerScriptId() << "]";
return ts.ReleaseString();
return blink::StrCat({GraphEdge::GetItemDesc(), " [", event_type_, "]",
" [listener id: ", blink::String::Number(listener_id_),
"]", " [listener script id: ",
blink::String::Number(GetListenerScriptId()), "]"});
}
void EdgeEventListenerAction::AddGraphMLAttributes(
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/execute/edge_execute_attr.cc
Vendored
+3 -4
View File
@@ -6,7 +6,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/execute/edge_execute_attr.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -25,9 +25,8 @@ ItemName EdgeExecuteAttr::GetItemName() const {
}
ItemDesc EdgeExecuteAttr::GetItemDesc() const {
blink::StringBuilder ts;
ts << EdgeExecute::GetItemDesc() << " [" << attribute_name_ << "]";
return ts.ReleaseString();
return blink::StrCat(
{EdgeExecute::GetItemDesc(), " [", attribute_name_, "]"});
}
void EdgeExecuteAttr::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_call.cc
Vendored
+4 -4
View File
@@ -10,7 +10,8 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/js/node_js.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/types.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
using ::blink::To;
@@ -38,9 +39,8 @@ ItemName EdgeJSCall::GetItemName() const {
}
ItemDesc EdgeJSCall::GetItemDesc() const {
blink::StringBuilder ts;
ts << GetItemName() << " [arguments: " << arguments_ << "]";
return ts.ReleaseString();
return blink::StrCat(
{GetItemName(), " [arguments: ", blink::String(arguments_), "]"});
}
void EdgeJSCall::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_result.cc
Vendored
+4 -4
View File
@@ -11,7 +11,8 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/types.h"
#include "third_party/blink/renderer/platform/wtf/casting.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
using ::blink::To;
@@ -32,9 +33,8 @@ ItemName EdgeJSResult::GetItemName() const {
}
ItemDesc EdgeJSResult::GetItemDesc() const {
blink::StringBuilder ts;
ts << GetItemName() << " [result: " << result_ << "]";
return ts.ReleaseString();
return blink::StrCat(
{GetItemName(), " [result: ", blink::String(result_), "]"});
}
void EdgeJSResult::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/node/edge_node_insert.cc
Vendored
+7 -8
View File
@@ -16,7 +16,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/types.h"
#include "third_party/blink/renderer/core/dom/dom_node_ids.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
using ::blink::DOMNodeId;
@@ -52,15 +52,14 @@ ItemDesc EdgeNodeInsert::GetItemDesc() const {
const GraphNode* prior_sibling_node = GetPriorSiblingNode();
blink::StringBuilder ts;
ts << EdgeNode::GetItemDesc();
ts << " [parent: " << parent_node->GetItemDesc() << "]";
if (prior_sibling_node) {
ts << " [prior sibling: " << prior_sibling_node->GetItemDesc() << "]";
return blink::StrCat(
{EdgeNode::GetItemDesc(), " [parent: ", parent_node->GetItemDesc(), "]",
" [prior sibling: ", prior_sibling_node->GetItemDesc(), "]"});
} else {
return blink::StrCat({EdgeNode::GetItemDesc(),
" [parent: ", parent_node->GetItemDesc(), "]"});
}
return ts.ReleaseString();
}
void EdgeNodeInsert::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_complete.cc
Vendored
+3 -4
View File
@@ -9,7 +9,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/utilities/response_metadata.h"
#include "third_party/blink/renderer/platform/loader/fetch/resource.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -38,9 +38,8 @@ ItemName EdgeRequestComplete::GetItemName() const {
}
ItemDesc EdgeRequestComplete::GetItemDesc() const {
blink::StringBuilder ts;
ts << EdgeRequestResponse::GetItemDesc() << " [" << resource_type_ << "]";
return ts.ReleaseString();
return blink::StrCat(
{EdgeRequestResponse::GetItemDesc(), " [", resource_type_, "]"});
}
void EdgeRequestComplete::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_start.cc
Vendored
+2 -4
View File
@@ -7,7 +7,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/node_resource.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -40,9 +40,7 @@ ItemName EdgeRequestStart::GetItemName() const {
}
ItemDesc EdgeRequestStart::GetItemDesc() const {
blink::StringBuilder ts;
ts << EdgeRequest::GetItemDesc() << " [" << resource_type_ << "]";
return ts.ReleaseString();
return blink::StrCat({EdgeRequest::GetItemDesc(), " [", resource_type_, "]"});
}
void EdgeRequestStart::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage.cc
Vendored
+3 -7
View File
@@ -8,7 +8,7 @@
#include <sstream>
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -22,14 +22,10 @@ EdgeStorage::EdgeStorage(GraphItemContext* context,
EdgeStorage::~EdgeStorage() = default;
ItemName EdgeStorage::GetItemDesc() const {
blink::StringBuilder ts;
ts << GraphEdge::GetItemDesc();
if (!key_.empty()) {
ts << " [" << key_ << "]";
return blink::StrCat({GraphEdge::GetItemDesc(), " [", key_, "]"});
}
return ts.ReleaseString();
return GraphEdge::GetItemDesc();
}
void EdgeStorage::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_read_result.cc
Vendored
+4 -4
View File
@@ -9,7 +9,8 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/actor/node_actor.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/storage/node_storage.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace brave_page_graph {
@@ -31,9 +32,8 @@ ItemName EdgeStorageReadResult::GetItemName() const {
}
ItemDesc EdgeStorageReadResult::GetItemDesc() const {
blink::StringBuilder ts;
ts << EdgeStorage::GetItemDesc() << " [value: " << value_ << "]";
return ts.ReleaseString();
return blink::StrCat(
{EdgeStorage::GetItemDesc(), " [value: ", blink::String(value_), "]"});
}
void EdgeStorageReadResult::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_set.cc
Vendored
+4 -4
View File
@@ -9,7 +9,8 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/actor/node_actor.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/storage/node_storage.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace brave_page_graph {
@@ -31,9 +32,8 @@ ItemName EdgeStorageSet::GetItemName() const {
}
ItemDesc EdgeStorageSet::GetItemDesc() const {
blink::StringBuilder ts;
ts << EdgeStorage::GetItemDesc() << " [value: " << value_ << "]";
return ts.ReleaseString();
return blink::StrCat(
{EdgeStorage::GetItemDesc(), " [value: ", blink::String(value_), "]"});
}
void EdgeStorageSet::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/graph_item.cc
Vendored
+3 -4
View File
@@ -7,7 +7,8 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/graph_item_context.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace brave_page_graph {
@@ -19,9 +20,7 @@ GraphItem::GraphItem(GraphItemContext* context)
GraphItem::~GraphItem() = default;
ItemDesc GraphItem::GetItemDesc() const {
blink::StringBuilder ts;
ts << GetItemName() << " #" << id_;
return ts.ReleaseString();
return blink::StrCat({GetItemName(), " #", blink::String::Number(id_)});
}
void GraphItem::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_dom_root.cc
Vendored
+6 -13
View File
@@ -7,7 +7,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/core/dom/dom_node_ids.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
using ::blink::DOMNodeId;
@@ -25,18 +25,11 @@ ItemName NodeDOMRoot::GetItemName() const {
}
ItemDesc NodeDOMRoot::GetItemDesc() const {
blink::StringBuilder ts;
ts << NodeHTMLElement::GetItemDesc();
ts << " [is attached: " << is_attached_;
ts << " security origin: ";
ts << (security_origin_.empty() ? "<empty>" : security_origin_);
ts << " url: ";
ts << (url_.empty() ? "<empty>" : url_);
ts << "]";
return ts.ReleaseString();
return blink::StrCat(
{NodeHTMLElement::GetItemDesc(), " [is attached: ",
blink::String::Boolean(is_attached_), " security origin: ",
(security_origin_.empty() ? "<empty>" : security_origin_),
" url: ", (url_.empty() ? "<empty>" : url_), "]"});
}
void NodeDOMRoot::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html.cc
Vendored
+3 -5
View File
@@ -9,7 +9,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/node/edge_node_delete.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/core/dom/dom_node_ids.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
using ::blink::DynamicTo;
@@ -30,12 +30,10 @@ void NodeHTML::MarkDeleted() {
}
ItemDesc NodeHTML::GetItemDesc() const {
blink::StringBuilder ts;
ts << GraphNode::GetItemDesc();
if (is_deleted_) {
ts << " [deleted]";
return blink::StrCat({GraphNode::GetItemDesc(), " [deleted]"});
}
return ts.ReleaseString();
return GraphNode::GetItemDesc();
}
void NodeHTML::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_text.cc
Vendored
+4 -4
View File
@@ -14,7 +14,8 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_element.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/core/dom/dom_node_ids.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
using ::blink::DOMNodeId;
using ::blink::DynamicTo;
@@ -33,9 +34,8 @@ ItemName NodeHTMLText::GetItemName() const {
}
ItemDesc NodeHTMLText::GetItemDesc() const {
blink::StringBuilder ts;
ts << NodeHTML::GetItemDesc() << " [length: " << text_.length() << "]";
return ts.ReleaseString();
return blink::StrCat({NodeHTML::GetItemDesc(), " [length: ",
blink::String::Number(text_.length()), "]"});
}
void NodeHTMLText::AddGraphMLAttributes(xmlDocPtr doc,
third_party/blink/renderer/core/brave_page_graph/graph_item/node/node_resource.cc
Vendored
+2 -4
View File
@@ -9,7 +9,7 @@
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_response.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_start.h"
#include "brave/third_party/blink/renderer/core/brave_page_graph/graphml.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder_stream.h"
#include "third_party/blink/renderer/platform/wtf/text/strcat.h"
namespace brave_page_graph {
@@ -23,9 +23,7 @@ ItemName NodeResource::GetItemName() const {
}
ItemDesc NodeResource::GetItemDesc() const {
blink::StringBuilder ts;
ts << GraphNode::GetItemDesc() << " [" << url_.GetString() << "]";
return ts.ReleaseString();
return blink::StrCat({GraphNode::GetItemDesc(), " [", url_.GetString(), "]"});
}
void NodeResource::AddGraphMLAttributes(xmlDocPtr doc,