mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: replace base::StringPrintf() calls with absl::StrFormat() (#46024)

Browse source 
The former is now a pass-through for the latter and is slated for removal

Xref: https://issues.chromium.org/issues/40241565

4907781
This commit is contained in:
Charles Kerr 2025-03-14 17:14:32 -05:00 • committed by GitHub
parent 3271b82094
commit 30d2fadb28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/api/electron_api_session.cc
View file

@ -1067,9 +1067,9 @@ std::string Session::RegisterPreloadScript(
}); });
if (it != preload_scripts.end()) { if (it != preload_scripts.end()) {
thrower.ThrowError(base::StringPrintf( thrower.ThrowError(
"Cannot register preload script with existing ID '%s'", absl::StrFormat("Cannot register preload script with existing ID '%s'",
new_preload_script.id.c_str())); new_preload_script.id));
return ""; return "";
} }
@ -1080,8 +1080,8 @@ std::string Session::RegisterPreloadScript(
<< new_preload_script.file_path; << new_preload_script.file_path;
} else { } else {
thrower.ThrowError( thrower.ThrowError(
base::StringPrintf("Preload script must have absolute path: %s", absl::StrFormat("Preload script must have absolute path: %s",
new_preload_script.file_path.value().c_str())); new_preload_script.file_path.value()));
return ""; return "";
} }
} }
@ -1110,9 +1110,8 @@ void Session::UnregisterPreloadScript(gin_helper::ErrorThrower thrower,
} }
// If the script is not found, throw an error // If the script is not found, throw an error
thrower.ThrowError(base::StringPrintf( thrower.ThrowError(absl::StrFormat(
"Cannot unregister preload script with non-existing ID '%s'", "Cannot unregister preload script with non-existing ID '%s'", script_id));
script_id.c_str()));
} }
std::vector<PreloadScript> Session::GetPreloadScripts() const { std::vector<PreloadScript> Session::GetPreloadScripts() const {

10
shell/browser/ui/devtools_ui_theme_data_source.cc
View file

@ -22,6 +22,7 @@
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui.h"
#include "net/base/url_util.h" #include "net/base/url_util.h"
#include "third_party/abseil-cpp/absl/strings/str_format.h"
#include "ui/base/webui/web_ui_util.h" #include "ui/base/webui/web_ui_util.h"
#include "ui/color/color_provider.h" #include "ui/color/color_provider.h"
#include "ui/color/color_provider_utils.h" #include "ui/color/color_provider_utils.h"
@ -157,17 +158,16 @@ void ThemeDataSource::SendColorsCss(
for (ui::ColorId id = start; id < end; ++id) { for (ui::ColorId id = start; id < end; ++id) {
const SkColor color = color_provider.GetColor(id); const SkColor color = color_provider.GetColor(id);
std::string css_id_to_color_mapping = std::string css_id_to_color_mapping =
base::StringPrintf("%s:%s;", color_css_name.Run(id).c_str(), absl::StrFormat("%s:%s;", color_css_name.Run(id),
ui::ConvertSkColorToCSSColor(color).c_str()); ui::ConvertSkColorToCSSColor(color));
base::StrAppend(&css_string, {css_id_to_color_mapping}); base::StrAppend(&css_string, {css_id_to_color_mapping});
if (generate_rgb_vars) { if (generate_rgb_vars) {
// Also generate a r,g,b string for each color so apps can construct // Also generate a r,g,b string for each color so apps can construct
// colors with their own opacities in css. // colors with their own opacities in css.
const std::string css_rgb_color_str = const std::string css_rgb_color_str =
color_utils::SkColorToRgbString(color); color_utils::SkColorToRgbString(color);
const std::string css_id_to_rgb_color_mapping = const std::string css_id_to_rgb_color_mapping = absl::StrFormat(
base::StringPrintf("%s-rgb:%s;", color_css_name.Run(id).c_str(), "%s-rgb:%s;", color_css_name.Run(id), css_rgb_color_str);
css_rgb_color_str.c_str());
base::StrAppend(&css_string, {css_id_to_rgb_color_mapping}); base::StrAppend(&css_string, {css_id_to_rgb_color_mapping});
} }
} }

10
shell/renderer/api/electron_api_context_bridge.cc
View file

@ -24,6 +24,7 @@
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/world_ids.h" #include "shell/common/world_ids.h"
#include "shell/renderer/preload_realm_context.h" #include "shell/renderer/preload_realm_context.h"
#include "third_party/abseil-cpp/absl/strings/str_format.h"
#include "third_party/blink/public/web/web_blob.h" #include "third_party/blink/public/web/web_blob.h"
#include "third_party/blink/public/web/web_element.h" #include "third_party/blink/public/web/web_element.h"
#include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_local_frame.h"
@ -944,7 +945,7 @@ v8::Local<v8::Value> ExecuteInWorld(v8::Isolate* isolate,
if (!maybe_target_context.ToLocal(&target_context)) { if (!maybe_target_context.ToLocal(&target_context)) {
isolate->ThrowException(v8::Exception::Error(gin::StringToV8( isolate->ThrowException(v8::Exception::Error(gin::StringToV8(
isolate, isolate,
base::StringPrintf("Failed to get context for world %d", world_id)))); absl::StrFormat("Failed to get context for world %d", world_id))));
return v8::Undefined(isolate); return v8::Undefined(isolate);
} }
@ -956,8 +957,7 @@ v8::Local<v8::Value> ExecuteInWorld(v8::Isolate* isolate,
v8::MaybeLocal<v8::Script> maybe_compiled_script; v8::MaybeLocal<v8::Script> maybe_compiled_script;
{ {
v8::TryCatch try_catch(isolate); v8::TryCatch try_catch(isolate);
std::string return_func_code = std::string return_func_code = absl::StrFormat("(%s)", function_str);
base::StringPrintf("(%s)", function_str.c_str());
maybe_compiled_script = v8::Script::Compile( maybe_compiled_script = v8::Script::Compile(
target_context, gin::StringToV8(isolate, return_func_code)); target_context, gin::StringToV8(isolate, return_func_code));
if (try_catch.HasCaught()) { if (try_catch.HasCaught()) {
@ -1021,7 +1021,7 @@ v8::Local<v8::Value> ExecuteInWorld(v8::Isolate* isolate,
v8::Local<v8::Value> arg; v8::Local<v8::Value> arg;
if (!args_array->Get(source_context, i).ToLocal(&arg)) { if (!args_array->Get(source_context, i).ToLocal(&arg)) {
gin_helper::ErrorThrower(isolate).ThrowError( gin_helper::ErrorThrower(isolate).ThrowError(
base::StringPrintf("Failed to get argument at index %d", i)); absl::StrFormat("Failed to get argument at index %d", i));
return v8::Undefined(isolate); return v8::Undefined(isolate);
} }
@ -1031,7 +1031,7 @@ v8::Local<v8::Value> ExecuteInWorld(v8::Isolate* isolate,
&object_cache); &object_cache);
if (proxied_arg.IsEmpty()) { if (proxied_arg.IsEmpty()) {
gin_helper::ErrorThrower(isolate).ThrowError( gin_helper::ErrorThrower(isolate).ThrowError(
base::StringPrintf("Failed to proxy argument at index %d", i)); absl::StrFormat("Failed to proxy argument at index %d", i));
return v8::Undefined(isolate); return v8::Undefined(isolate);
} }
proxied_args.push_back(proxied_arg.ToLocalChecked()); proxied_args.push_back(proxied_arg.ToLocalChecked());