bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cefclient: Fix accidental usage of C++20 map::contains (see #3611)

This commit is contained in:
Marshall Greenblatt 2024-11-18 10:49:12 -05:00
parent f8b673a3ea
commit 7538208409
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cefclient/browser/root_window_manager.cc
View File

@ -249,9 +249,10 @@ void RootWindowManager::OtherBrowserClosed(int browser_id,
// Track ownership of popup browsers that don't have a RootWindow. // Track ownership of popup browsers that don't have a RootWindow.
if (opener_browser_id > 0) { if (opener_browser_id > 0) {
DCHECK(other_browser_owners_.contains(opener_browser_id)); DCHECK(other_browser_owners_.find(opener_browser_id) !=
other_browser_owners_.end());
auto& child_set = other_browser_owners_[opener_browser_id]; auto& child_set = other_browser_owners_[opener_browser_id];
DCHECK(child_set.contains(browser_id)); DCHECK(child_set.find(browser_id) != child_set.end());
child_set.erase(browser_id); child_set.erase(browser_id);
if (child_set.empty()) { if (child_set.empty()) {
other_browser_owners_.erase(opener_browser_id); other_browser_owners_.erase(opener_browser_id);
@ -313,7 +314,8 @@ void RootWindowManager::OnAbortOrClosePopup(int opener_browser_id,
// Close all other associated popups if the opener is closing. These popups // Close all other associated popups if the opener is closing. These popups
// don't have a RootWindow (e.g. when running with `--use-default-popup`). // don't have a RootWindow (e.g. when running with `--use-default-popup`).
if (popup_id < 0 && other_browser_owners_.contains(opener_browser_id)) { if (popup_id < 0 && other_browser_owners_.find(opener_browser_id) !=
other_browser_owners_.end()) {
// Use a copy as the original set may be modified in OtherBrowserClosed // Use a copy as the original set may be modified in OtherBrowserClosed
// while iterating. // while iterating.
auto set = other_browser_owners_[opener_browser_id]; auto set = other_browser_owners_[opener_browser_id];