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

perf: small perf changes in HidChooserController (#39057)

Browse source 
* perf: avoid string temporary in HidChooserController::PhysicalDeviceIdFromDeviceInfo()

return a const ref instead of a new string

* perf: avoid second map lookup in HidChooserController::AddDeviceInfo()
This commit is contained in:
Charles Kerr 2023-07-19 09:54:30 -05:00 • committed by GitHub
parent cc39ddb728
commit f2b32af1f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
shell/browser/hid/hid_chooser_controller.cc
View file

@ -106,7 +106,7 @@ HidChooserController::~HidChooserController() {
} }
// static // static
std::string HidChooserController::PhysicalDeviceIdFromDeviceInfo( const std::string& HidChooserController::PhysicalDeviceIdFromDeviceInfo(
const device::mojom::HidDeviceInfo& device) { const device::mojom::HidDeviceInfo& device) {
// A single physical device may expose multiple HID interfaces, each // A single physical device may expose multiple HID interfaces, each
// represented by a HidDeviceInfo object. When a device exposes multiple // represented by a HidDeviceInfo object. When a device exposes multiple
@ -148,11 +148,10 @@ void HidChooserController::OnDeviceAdded(
void HidChooserController::OnDeviceRemoved( void HidChooserController::OnDeviceRemoved(
const device::mojom::HidDeviceInfo& device) { const device::mojom::HidDeviceInfo& device) {
auto id = PhysicalDeviceIdFromDeviceInfo(device); if (!base::Contains(items_, PhysicalDeviceIdFromDeviceInfo(device)))
if (!base::Contains(items_, id))
return; return;
api::Session* session = GetSession();
if (session) { if (api::Session* session = GetSession(); session != nullptr) {
auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_); auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_);
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope scope(isolate); v8::HandleScope scope(isolate);
@ -306,21 +305,20 @@ bool HidChooserController::IsExcluded(
bool HidChooserController::AddDeviceInfo( bool HidChooserController::AddDeviceInfo(
const device::mojom::HidDeviceInfo& device) { const device::mojom::HidDeviceInfo& device) {
auto id = PhysicalDeviceIdFromDeviceInfo(device); const auto& id = PhysicalDeviceIdFromDeviceInfo(device);
auto find_it = device_map_.find(id); auto [iter, is_new_physical_device] = device_map_.try_emplace(id);
if (find_it != device_map_.end()) { iter->second.emplace_back(device.Clone());
find_it->second.push_back(device.Clone());
return false; // append new devices to the chooser list
} if (is_new_physical_device)
// A new device was connected. Append it to the end of the chooser list. items_.emplace_back(id);
device_map_[id].push_back(device.Clone());
items_.push_back(id); return is_new_physical_device;
return true;
} }
bool HidChooserController::RemoveDeviceInfo( bool HidChooserController::RemoveDeviceInfo(
const device::mojom::HidDeviceInfo& device) { const device::mojom::HidDeviceInfo& device) {
auto id = PhysicalDeviceIdFromDeviceInfo(device); const auto& id = PhysicalDeviceIdFromDeviceInfo(device);
auto find_it = device_map_.find(id); auto find_it = device_map_.find(id);
DCHECK(find_it != device_map_.end()); DCHECK(find_it != device_map_.end());
auto& device_infos = find_it->second; auto& device_infos = find_it->second;
@ -338,7 +336,7 @@ bool HidChooserController::RemoveDeviceInfo(
void HidChooserController::UpdateDeviceInfo( void HidChooserController::UpdateDeviceInfo(
const device::mojom::HidDeviceInfo& device) { const device::mojom::HidDeviceInfo& device) {
auto id = PhysicalDeviceIdFromDeviceInfo(device); const auto& id = PhysicalDeviceIdFromDeviceInfo(device);
auto physical_device_it = device_map_.find(id); auto physical_device_it = device_map_.find(id);
DCHECK(physical_device_it != device_map_.end()); DCHECK(physical_device_it != device_map_.end());
auto& device_infos = physical_device_it->second; auto& device_infos = physical_device_it->second;

2
shell/browser/hid/hid_chooser_controller.h
View file

@ -54,7 +54,7 @@ class HidChooserController
~HidChooserController() override; ~HidChooserController() override;
// static // static
static std::string PhysicalDeviceIdFromDeviceInfo( static const std::string& PhysicalDeviceIdFromDeviceInfo(
const device::mojom::HidDeviceInfo& device); const device::mojom::HidDeviceInfo& device);
// HidChooserContext::DeviceObserver: // HidChooserContext::DeviceObserver: