From ec4a5aa199ec4bfc837f7356342b708881e68ccb Mon Sep 17 00:00:00 2001 From: Darnell Andries Date: Tue, 16 Sep 2025 08:38:54 -0700 Subject: [PATCH] [CodeHealth] Replace `blink::StringBuilder` with `blink::StrCat` part 1 (#31029) [CodeHealth] Replace blink::StringBuilder with blink::StrCat part 1 --- .../modules/plugins/dom_plugin_array.cc | 11 ++++------- .../edge/attribute/edge_attribute.cc | 6 ++---- .../edge/attribute/edge_attribute_set.cc | 8 +++----- .../graph_item/edge/edge_text_change.cc | 6 ++---- .../event_listener/edge_event_listener.cc | 9 ++++----- .../edge_event_listener_action.cc | 12 ++++++------ .../edge/execute/edge_execute_attr.cc | 7 +++---- .../graph_item/edge/js/edge_js_call.cc | 8 ++++---- .../graph_item/edge/js/edge_js_result.cc | 8 ++++---- .../graph_item/edge/node/edge_node_insert.cc | 15 +++++++-------- .../edge/request/edge_request_complete.cc | 7 +++---- .../edge/request/edge_request_start.cc | 6 ++---- .../graph_item/edge/storage/edge_storage.cc | 10 +++------- .../edge/storage/edge_storage_read_result.cc | 8 ++++---- .../edge/storage/edge_storage_set.cc | 8 ++++---- .../brave_page_graph/graph_item/graph_item.cc | 7 +++---- .../graph_item/node/html/node_dom_root.cc | 19 ++++++------------- .../graph_item/node/html/node_html.cc | 8 +++----- .../graph_item/node/html/node_html_text.cc | 8 ++++---- .../graph_item/node/node_resource.cc | 6 ++---- 20 files changed, 73 insertions(+), 104 deletions(-) diff --git a/chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc b/chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc index 02cefed7dad..4da719de6ad 100644 --- a/chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc +++ b/chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc @@ -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 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 diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute.cc index a2e184ecbed..0e359b07685 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute_set.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute_set.cc index e91553b16d9..67609ad7c07 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute_set.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/attribute/edge_attribute_set.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/edge_text_change.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/edge_text_change.cc index 9459765a106..1ba3c60e04d 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/edge_text_change.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/edge_text_change.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener.cc index d4a4b6b33c7..d21987a8846 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener_action.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener_action.cc index 9bef306693e..33157a83a59 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener_action.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/event_listener/edge_event_listener_action.cc @@ -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( diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/execute/edge_execute_attr.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/execute/edge_execute_attr.cc index 6f42bdfb210..556fd2bb642 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/execute/edge_execute_attr.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/execute/edge_execute_attr.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_call.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_call.cc index 3801f72e8bb..37db8b754c7 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_call.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_call.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_result.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_result.cc index 623d799e772..3b4e9a85dcf 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_result.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/js/edge_js_result.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/node/edge_node_insert.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/node/edge_node_insert.cc index 210e16da784..c7bf848387f 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/node/edge_node_insert.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/node/edge_node_insert.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_complete.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_complete.cc index 2b8f4706f4b..bb94da2f5a7 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_complete.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_complete.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_start.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_start.cc index e1b7d06c61f..bdf6ac0e3d1 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_start.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/request/edge_request_start.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage.cc index 5b5c7332062..5449add593b 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage.cc @@ -8,7 +8,7 @@ #include #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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_read_result.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_read_result.cc index 6567c0b777a..86c111ab644 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_read_result.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_read_result.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_set.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_set.cc index f6eda141596..dfeed2a4b0b 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_set.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/edge/storage/edge_storage_set.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/graph_item.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/graph_item.cc index 022970994ea..3249f554712 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/graph_item.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/graph_item.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_dom_root.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_dom_root.cc index 87022c4854b..68ac312bedb 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_dom_root.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_dom_root.cc @@ -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() ? "" : security_origin_); - - ts << " url: "; - ts << (url_.empty() ? "" : url_); - - ts << "]"; - return ts.ReleaseString(); + return blink::StrCat( + {NodeHTMLElement::GetItemDesc(), " [is attached: ", + blink::String::Boolean(is_attached_), " security origin: ", + (security_origin_.empty() ? "" : security_origin_), + " url: ", (url_.empty() ? "" : url_), "]"}); } void NodeDOMRoot::AddGraphMLAttributes(xmlDocPtr doc, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html.cc index 839db2dadcf..1af494c03c5 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_text.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_text.cc index ec64c9fa0c0..9ce214f67f0 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_text.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/node/html/node_html_text.cc @@ -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, diff --git a/third_party/blink/renderer/core/brave_page_graph/graph_item/node/node_resource.cc b/third_party/blink/renderer/core/brave_page_graph/graph_item/node/node_resource.cc index c9bdde0a6e5..7e93532c1f5 100644 --- a/third_party/blink/renderer/core/brave_page_graph/graph_item/node/node_resource.cc +++ b/third_party/blink/renderer/core/brave_page_graph/graph_item/node/node_resource.cc @@ -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,