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

Unified Diff: extensions/browser/extension_user_script_loader.cc

Issue 2197513002: [UserScript] Do not create SubstitutionMap if not necessary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/extension_user_script_loader.cc
diff --git a/extensions/browser/extension_user_script_loader.cc b/extensions/browser/extension_user_script_loader.cc
index 12e488e733ce4b0291db068c713012c6a3cfeb87..b28821bb4e2a5dffffaaac1469a2e4aa56bbdc56 100644
--- a/extensions/browser/extension_user_script_loader.cc
+++ b/extensions/browser/extension_user_script_loader.cc
@@ -131,16 +131,19 @@ void LoadUserScripts(UserScriptList* user_scripts,
for (UserScript& script : *user_scripts) {
if (added_script_ids.count(script.id()) == 0)
continue;
- std::unique_ptr<SubstitutionMap> localization_messages(
- GetLocalizationMessages(hosts_info, script.host_id()));
for (UserScript::File& script_file : script.js_scripts()) {
if (script_file.GetContent().empty())
LoadScriptContent(script.host_id(), &script_file, nullptr, verifier);
}
- for (UserScript::File& script_file : script.css_scripts()) {
- if (script_file.GetContent().empty())
- LoadScriptContent(script.host_id(), &script_file,
- localization_messages.get(), verifier);
+ if (script.css_scripts().size() > 0) {
+ std::unique_ptr<SubstitutionMap> localization_messages(
+ GetLocalizationMessages(hosts_info, script.host_id()));
+ for (UserScript::File& script_file : script.css_scripts()) {
+ if (script_file.GetContent().empty()) {
+ LoadScriptContent(script.host_id(), &script_file,
+ localization_messages.get(), verifier);
+ }
+ }
}
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698