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

perf: avoid unnecessary vector copy in GetMimeTypeToExtensionIdMap() (#46395)

Browse source 
* perf: avoid making an unnecessary copy of the vector

MimeTypesHandler::GetMIMETypeAllowlist() returns a const&, so we can
iterate that directly instead of making a temporary copy of it.

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* perf: move the call to ExtensionRegistry::Get() outside of the loop

Also, keep the previous behavior of not calling it at all if there
aren't any whitelisted extensions.

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* perf: avoid redundant map lookup

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: const correctness

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: cleanup

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2025-04-01 09:07:45 -05:00 • committed by GitHub
parent c95323051a
commit d0658ccc98
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
shell/browser/plugins/plugin_utils.cc
View file

@ -33,30 +33,33 @@ std::string PluginUtils::GetExtensionIdForMimeType(
base::flat_map<std::string, std::string>
PluginUtils::GetMimeTypeToExtensionIdMap(
content::BrowserContext* browser_context) {
base::flat_map<std::string, std::string> mime_type_to_extension_id_map;
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
std::vector<std::string> allowed_extension_ids =
MimeTypesHandler::GetMIMETypeAllowlist();
const auto& allowed_extension_ids = MimeTypesHandler::GetMIMETypeAllowlist();
if (allowed_extension_ids.empty())
return {};
const extensions::ExtensionSet& enabled_extensions =
extensions::ExtensionRegistry::Get(browser_context)->enabled_extensions();
base::flat_map<std::string, std::string> mime_type_to_extension_id_map;
// Go through the white-listed extensions and try to use them to intercept
// the URL request.
for (const std::string& extension_id : allowed_extension_ids) {
const extensions::Extension* extension =
extensions::ExtensionRegistry::Get(browser_context)
->enabled_extensions()
.GetByID(extension_id);
// The white-listed extension may not be installed, so we have to nullptr
// check |extension|.
if (!extension) {
for (const std::string& id : allowed_extension_ids) {
const extensions::Extension* extension = enabled_extensions.GetByID(id);
if (!extension) // extension might not be installed, so check for nullptr
continue;
}
if (MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension)) {
for (const auto& supported_mime_type : handler->mime_type_set()) {
DCHECK(!mime_type_to_extension_id_map.contains(supported_mime_type));
mime_type_to_extension_id_map[supported_mime_type] = extension_id;
if (const MimeTypesHandler* handler =
MimeTypesHandler::GetHandler(extension)) {
for (const std::string& mime_type : handler->mime_type_set()) {
const auto [_, inserted] =
mime_type_to_extension_id_map.insert_or_assign(mime_type, id);
DCHECK(inserted);
}
}
}
#endif
return mime_type_to_extension_id_map;
}