aphrody-labs/cef
1
0 Fork 0
mirror of https://github.com/aphrody-labs/cef.git synced 2026-10-13 21:07:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use range-based for loops for C++20 modernization (see #3590)

Browse Source 
Convert iterator-declared-before-loop patterns to modern range-based for loops
with structured bindings where applicable.
This commit is contained in:
Marshall Greenblatt committed 2026-01-22 12:08:51 -05:00
1 parent abfdbbc707
commit 0a54ffdaeb
46 files changed
+278 -446
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libcef/browser/browser_info_manager.cc
+4 -5
View File
@@ -463,8 +463,8 @@ void CefBrowserInfoManager::RemoveBrowserInfo(
scoped_refptr<CefBrowserInfo> browser_info) {
base::AutoLock lock_scope(browser_info_lock_);
BrowserInfoList::iterator it = browser_info_list_.begin();
for (; it != browser_info_list_.end(); ++it) {
for (auto it = browser_info_list_.begin(); it != browser_info_list_.end();
++it) {
if (*it == browser_info) {
browser_info_list_.erase(it);
return;
@@ -484,9 +484,8 @@ void CefBrowserInfoManager::DestroyAllBrowsers() {
// Destroy any remaining browser windows.
if (!list.empty()) {
BrowserInfoList::iterator it = list.begin();
for (; it != list.end(); ++it) {
CefRefPtr<CefBrowserHostBase> browser = (*it)->browser();
for (const auto& browser_info : list) {
CefRefPtr<CefBrowserHostBase> browser = browser_info->browser();
DCHECK(browser.get());
if (browser.get()) {
// DestroyBrowser will call RemoveBrowserInfo.
libcef/browser/context_menu_params_impl.cc
+2 -4
View File
@@ -127,10 +127,8 @@ bool CefContextMenuParamsImpl::GetDictionarySuggestions(
return false;
}
std::vector<std::u16string>::const_iterator it =
const_value().dictionary_suggestions.begin();
for (; it != const_value().dictionary_suggestions.end(); ++it) {
suggestions.push_back(*it);
for (const auto& suggestion : const_value().dictionary_suggestions) {
suggestions.push_back(suggestion);
}
return true;
libcef/browser/download_manager_delegate_impl.cc
+7 -10
View File
@@ -303,9 +303,8 @@ CefDownloadManagerDelegateImpl::CefDownloadManagerDelegateImpl(
DownloadManager::DownloadVector items;
manager->GetAllDownloads(&items);
DownloadManager::DownloadVector::const_iterator it = items.begin();
for (; it != items.end(); ++it) {
OnDownloadCreated(manager, *it);
for (const auto& item : items) {
OnDownloadCreated(manager, item);
}
}
@@ -348,9 +347,8 @@ void CefDownloadManagerDelegateImpl::OnDownloadDestroyed(DownloadItem* item) {
// Determine if any remaining DownloadItems are associated with the same
// browser. If not, then unregister as an observer.
bool has_remaining = false;
ItemBrowserMap::const_iterator it2 = item_browser_map_.begin();
for (; it2 != item_browser_map_.end(); ++it2) {
if (it2->second == browser) {
for (const auto& [other_item, other_browser] : item_browser_map_) {
if (other_browser == browser) {
has_remaining = true;
break;
}
@@ -441,13 +439,12 @@ bool CefDownloadManagerDelegateImpl::DetermineDownloadTarget(
void CefDownloadManagerDelegateImpl::OnBrowserDestroyed(
CefBrowserHostBase* browser) {
ItemBrowserMap::iterator it = item_browser_map_.begin();
for (; it != item_browser_map_.end(); ++it) {
if (it->second == browser) {
for (auto& [item, item_browser] : item_browser_map_) {
if (item_browser == browser) {
// Don't call back into browsers that have been destroyed. We're not
// canceling the download so it will continue silently until it completes
// or until the associated browser context is destroyed.
it->second = nullptr;
item_browser = nullptr;
}
}
}
libcef/browser/file_dialog_manager.cc
+4 -6
View File
@@ -49,9 +49,8 @@ class CefFileDialogCallbackImpl : public CefFileDialogCallback {
if (!callback_.is_null()) {
std::vector<base::FilePath> vec;
if (!file_paths.empty()) {
std::vector<CefString>::const_iterator it = file_paths.begin();
for (; it != file_paths.end(); ++it) {
vec.push_back(base::FilePath(*it));
for (const auto& file_path : file_paths) {
vec.push_back(base::FilePath(file_path));
}
}
std::move(callback_).Run(vec);
@@ -312,9 +311,8 @@ void CefFileDialogManager::RunFileDialog(
}
if (!accept_filters.empty()) {
std::vector<CefString>::const_iterator it = accept_filters.begin();
for (; it != accept_filters.end(); ++it) {
params.accept_types.push_back(*it);
for (const auto& accept_filter : accept_filters) {
params.accept_types.push_back(accept_filter);
}
}
libcef/browser/media_access_query.cc
+3 -4
View File
@@ -25,10 +25,9 @@ const blink::MediaStreamDevice* FindDefaultDeviceWithId(
return nullptr;
}
blink::MediaStreamDevices::const_iterator iter = devices.begin();
for (; iter != devices.end(); ++iter) {
if (iter->id == device_id) {
return &(*iter);
for (const auto& device : devices) {
if (device.id == device_id) {
return &device;
}
}
libcef/browser/menu_model_impl.cc
+3 -3
View File
@@ -416,9 +416,9 @@ int CefMenuModelImpl::GetIndexOf(int command_id) {
return kInvalidIndex;
}
for (ItemVector::iterator i = items_.begin(); i != items_.end(); ++i) {
if ((*i).command_id_ == command_id) {
return static_cast<int>(std::distance(items_.begin(), i));
for (size_t i = 0; i < items_.size(); ++i) {
if (items_[i].command_id_ == command_id) {
return static_cast<int>(i);
}
}
return kInvalidIndex;
libcef/browser/net_service/resource_request_handler_wrapper.cc
+2 -2
View File
@@ -1110,8 +1110,8 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
// is deleted, so if the request is currently pending also remove it from
// the list.
if (!pending_requests_.empty()) {
PendingRequests::iterator it = pending_requests_.begin();
for (; it != pending_requests_.end(); ++it) {
for (auto it = pending_requests_.begin(); it != pending_requests_.end();
++it) {
if ((*it)->id_ == request_id) {
pending_requests_.erase(it);
break;
libcef/browser/origin_whitelist_impl.cc
+1 -2
View File
@@ -78,8 +78,7 @@ class CefOriginWhitelistManager {
{
base::AutoLock lock_scope(lock_);
CrossOriginWhiteList::iterator it = origin_list_.begin();
for (; it != origin_list_.end(); ++it) {
for (auto it = origin_list_.begin(); it != origin_list_.end(); ++it) {
if (*it == info) {
origin_list_.erase(it);
found = true;
libcef/browser/print_settings_impl.cc
+2 -6
View File
@@ -71,9 +71,7 @@ int CefPrintSettingsImpl::GetDPI() {
void CefPrintSettingsImpl::SetPageRanges(const PageRangeList& ranges) {
CEF_VALUE_VERIFY_RETURN_VOID(true);
printing::PageRanges page_ranges;
PageRangeList::const_iterator it = ranges.begin();
for (; it != ranges.end(); ++it) {
const CefRange& cef_range = *it;
for (const auto& cef_range : ranges) {
printing::PageRange range;
range.from = cef_range.from;
range.to = cef_range.to;
@@ -93,9 +91,7 @@ void CefPrintSettingsImpl::GetPageRanges(PageRangeList& ranges) {
ranges.clear();
}
const printing::PageRanges& page_ranges = const_value().ranges();
printing::PageRanges::const_iterator it = page_ranges.begin();
for (; it != page_ranges.end(); ++it) {
const printing::PageRange& range = *it;
for (const auto& range : page_ranges) {
ranges.emplace_back(range.from, range.to);
}
}
libcef/browser/server_impl.cc
+8 -12
View File
@@ -74,15 +74,13 @@ CefRefPtr<CefRequest> CreateRequest(const std::string& address,
CefRequest::HeaderMap header_map;
if (!info.headers.empty()) {
net::HttpServerRequestInfo::HeadersMap::const_iterator it =
info.headers.begin();
for (; it != info.headers.end(); ++it) {
for (const auto& [header_name, header_value] : info.headers) {
// Don't include Referer in the header map.
if (base::EqualsCaseInsensitiveASCII(it->first,
if (base::EqualsCaseInsensitiveASCII(header_name,
net::HttpRequestHeaders::kReferer)) {
referer = it->second;
referer = header_value;
} else {
header_map.insert(std::make_pair(it->first, it->second));
header_map.insert(std::make_pair(header_name, header_value));
}
}
}
@@ -310,9 +308,8 @@ void CefServerImpl::SendHttpResponse(int connection_id,
net::HttpServerResponseInfo response(
static_cast<net::HttpStatusCode>(response_code));
HeaderMap::const_iterator it = extra_headers.begin();
for (; it != extra_headers.end(); ++it) {
response.AddHeader(it->first.ToString(), it->second.ToString());
for (const auto& [header_name, header_value] : extra_headers) {
response.AddHeader(header_name.ToString(), header_value.ToString());
}
response.AddHeader(net::HttpRequestHeaders::kContentType,
@@ -607,9 +604,8 @@ void CefServerImpl::ShutdownOnHandlerThread() {
// OnClose won't be called for clients that are connected when the server
// shuts down, so send the disconnected notification here.
ConnectionInfoMap::const_iterator it = temp_map.begin();
for (; it != temp_map.end(); ++it) {
handler_->OnClientDisconnected(this, it->first);
for (const auto& [connection_id, info] : temp_map) {
handler_->OnClientDisconnected(this, connection_id);
}
}
libcef/browser/x509_cert_principal_impl.cc
+2 -3
View File
@@ -13,9 +13,8 @@ void TransferVector(const std::vector<std::string>& source,
}
if (!source.empty()) {
std::vector<std::string>::const_iterator it = source.begin();
for (; it != source.end(); ++it) {
target.push_back(*it);
for (const auto& item : source) {
target.push_back(item);
}
}
}
libcef/common/app_manager.cc
+2 -3
View File
@@ -61,9 +61,8 @@ bool CefAppManager::HasCustomScheme(const std::string& scheme_name) {
return false;
}
SchemeInfoList::const_iterator it = scheme_info_list_.begin();
for (; it != scheme_info_list_.end(); ++it) {
if (it->scheme_name == scheme_name) {
for (const auto& info : scheme_info_list_) {
if (info.scheme_name == scheme_name) {
return true;
}
}
libcef/common/command_line_impl.cc
+6 -12
View File
@@ -68,10 +68,8 @@ void CefCommandLineImpl::Reset() {
void CefCommandLineImpl::GetArgv(std::vector<CefString>& argv) {
CEF_VALUE_VERIFY_RETURN_VOID(false);
const base::CommandLine::StringVector& cmd_argv = const_value().argv();
base::CommandLine::StringVector::const_iterator it = cmd_argv.begin();
for (; it != cmd_argv.end(); ++it) {
argv.push_back(*it);
for (const auto& arg : const_value().argv()) {
argv.push_back(arg);
}
}
@@ -108,10 +106,8 @@ CefString CefCommandLineImpl::GetSwitchValue(const CefString& name) {
void CefCommandLineImpl::GetSwitches(SwitchMap& switches) {
CEF_VALUE_VERIFY_RETURN_VOID(false);
const base::CommandLine::SwitchMap& map = const_value().GetSwitches();
base::CommandLine::SwitchMap::const_iterator it = map.begin();
for (; it != map.end(); ++it) {
switches.insert(std::make_pair(it->first, it->second));
for (const auto& [key, value] : const_value().GetSwitches()) {
switches.insert(std::make_pair(key, value));
}
}
@@ -142,10 +138,8 @@ bool CefCommandLineImpl::HasArguments() {
void CefCommandLineImpl::GetArguments(ArgumentList& arguments) {
CEF_VALUE_VERIFY_RETURN_VOID(false);
const base::CommandLine::StringVector& vec = const_value().GetArgs();
base::CommandLine::StringVector::const_iterator it = vec.begin();
for (; it != vec.end(); ++it) {
arguments.push_back(*it);
for (const auto& arg : const_value().GetArgs()) {
arguments.push_back(arg);
}
}
libcef/common/drag_data_impl.cc
+5 -7
View File
@@ -124,11 +124,10 @@ bool CefDragDataImpl::GetFileNames(std::vector<CefString>& names) {
return false;
}
std::vector<ui::FileInfo>::const_iterator it = data_.filenames.begin();
for (; it != data_.filenames.end(); ++it) {
auto name = it->display_name.value();
for (const auto& file_info : data_.filenames) {
auto name = file_info.display_name.value();
if (name.empty()) {
name = it->path.BaseName().value();
name = file_info.path.BaseName().value();
}
names.push_back(name);
}
@@ -142,9 +141,8 @@ bool CefDragDataImpl::GetFilePaths(std::vector<CefString>& paths) {
return false;
}
std::vector<ui::FileInfo>::const_iterator it = data_.filenames.begin();
for (; it != data_.filenames.end(); ++it) {
auto path = it->path.value();
for (const auto& file_info : data_.filenames) {
auto path = file_info.path.value();
paths.push_back(path);
}
libcef/common/request_impl.cc
+14 -22
View File
@@ -65,11 +65,10 @@ int GetCacheControlHeaderPolicy(CefRequest::HeaderMap headerMap) {
// Extract the Cache-Control header line.
{
CefRequest::HeaderMap::const_iterator it = headerMap.begin();
for (; it != headerMap.end(); ++it) {
for (const auto& [key, value] : headerMap) {
if (base::EqualsCaseInsensitiveASCII(
it->first.ToString(), net::HttpRequestHeaders::kCacheControl)) {
line = it->second;
key.ToString(), net::HttpRequestHeaders::kCacheControl)) {
line = value;
break;
}
}
@@ -145,14 +144,11 @@ void GetHeaderMap(const CefRequest::HeaderMap& source,
CefRequest::HeaderMap& map) {
map.clear();
CefRequest::HeaderMap::const_iterator it = source.begin();
for (; it != source.end(); ++it) {
const CefString& name = it->first;
for (const auto& [name, value] : source) {
// Do not include Referer in the header map.
if (!base::EqualsCaseInsensitiveASCII(name.ToString(),
net::HttpRequestHeaders::kReferer)) {
map.insert(std::make_pair(name, it->second));
map.insert(std::make_pair(name, value));
}
}
}
@@ -941,9 +937,8 @@ bool CefPostDataImpl::AddElement(CefRefPtr<CefPostDataElement> element) {
CHECK_READONLY_RETURN(false);
// check that the element isn't already in the list before adding
ElementVector::const_iterator it = elements_.begin();
for (; it != elements_.end(); ++it) {
if (it->get() == element.get()) {
for (const auto& existing : elements_) {
if (existing.get() == element.get()) {
found = true;
break;
}
@@ -998,9 +993,8 @@ void CefPostDataImpl::SetReadOnly(bool read_only) {
read_only_ = read_only;
ElementVector::const_iterator it = elements_.begin();
for (; it != elements_.end(); ++it) {
static_cast<CefPostDataElementImpl*>(it->get())->SetReadOnly(read_only);
for (const auto& element : elements_) {
static_cast<CefPostDataElementImpl*>(element.get())->SetReadOnly(read_only);
}
}
@@ -1013,10 +1007,9 @@ void CefPostDataImpl::SetTrackChanges(bool track_changes) {
track_changes_ = track_changes;
has_changes_ = false;
ElementVector::const_iterator it = elements_.begin();
for (; it != elements_.end(); ++it) {
static_cast<CefPostDataElementImpl*>(it->get())->SetTrackChanges(
track_changes);
for (const auto& element : elements_) {
static_cast<CefPostDataElementImpl*>(element.get())
->SetTrackChanges(track_changes);
}
}
@@ -1026,9 +1019,8 @@ bool CefPostDataImpl::HasChanges() const {
return true;
}
ElementVector::const_iterator it = elements_.begin();
for (; it != elements_.end(); ++it) {
if (static_cast<CefPostDataElementImpl*>(it->get())->HasChanges()) {
for (const auto& element : elements_) {
if (static_cast<CefPostDataElementImpl*>(element.get())->HasChanges()) {
return true;
}
}
libcef/common/value_base.cc
+16 -22
View File
@@ -60,9 +60,8 @@ void CefValueController::Remove(void* value, bool notify_object) {
// Remove all references.
if (reference_map_.size() > 0) {
ReferenceMap::iterator it = reference_map_.begin();
for (; it != reference_map_.end(); ++it) {
it->second->OnControlRemoved();
for (const auto& [ref_value, ref_object] : reference_map_) {
ref_object->OnControlRemoved();
}
reference_map_.clear();
}
@@ -190,30 +189,26 @@ void CefValueController::TakeFrom(CefValueController* other) {
if (!other->reference_map_.empty()) {
// Transfer references from the other to this.
ReferenceMap::iterator it = other->reference_map_.begin();
for (; it != other->reference_map_.end(); ++it) {
for (const auto& [value, object] : other->reference_map_) {
// References should only be added once.
DCHECK(!reference_map_.contains(it->first));
reference_map_.insert(std::make_pair(it->first, it->second));
DCHECK(!reference_map_.contains(value));
reference_map_.insert(std::make_pair(value, object));
}
other->reference_map_.clear();
}
if (!other->dependency_map_.empty()) {
// Transfer dependencies from the other to this.
DependencyMap::iterator it_other = other->dependency_map_.begin();
for (; it_other != other->dependency_map_.end(); ++it_other) {
DependencyMap::iterator it_me = dependency_map_.find(it_other->first);
for (const auto& [parent, children] : other->dependency_map_) {
DependencyMap::iterator it_me = dependency_map_.find(parent);
if (it_me == dependency_map_.end()) {
// All children are new.
dependency_map_.insert(
std::make_pair(it_other->first, it_other->second));
dependency_map_.insert(std::make_pair(parent, children));
} else {
// Evaluate each child.
DependencySet::iterator it_other_set = it_other->second.begin();
for (; it_other_set != it_other->second.end(); ++it_other_set) {
if (!it_me->second.contains(*it_other_set)) {
it_me->second.insert(*it_other_set);
for (const auto& child : children) {
if (!it_me->second.contains(child)) {
it_me->second.insert(child);
}
}
}
@@ -248,12 +243,11 @@ void CefValueController::Swap(void* old_value, void* new_value) {
dependency_map_.erase(it);
}
it = dependency_map_.begin();
for (; it != dependency_map_.end(); ++it) {
DependencySet::iterator dit = it->second.find(old_value);
if (dit != it->second.end()) {
it->second.insert(new_value);
it->second.erase(dit);
for (auto& [parent, children] : dependency_map_) {
DependencySet::iterator dit = children.find(old_value);
if (dit != children.end()) {
children.insert(new_value);
children.erase(dit);
}
}
}
libcef/renderer/dom_document_impl.cc
+4 -7
View File
@@ -220,8 +220,7 @@ CefRefPtr<CefDOMNode> CefDOMDocumentImpl::GetOrCreateNode(
if (!node_map_.empty()) {
// Locate the existing node, if any.
NodeMap::const_iterator it = node_map_.find(node);
if (it != node_map_.end()) {
if (auto it = node_map_.find(node); it != node_map_.end()) {
return it->second;
}
}
@@ -238,8 +237,7 @@ void CefDOMDocumentImpl::RemoveNode(const blink::WebNode& node) {
}
if (!node_map_.empty()) {
NodeMap::iterator it = node_map_.find(node);
if (it != node_map_.end()) {
if (auto it = node_map_.find(node); it != node_map_.end()) {
node_map_.erase(it);
}
}
@@ -259,9 +257,8 @@ void CefDOMDocumentImpl::Detach() {
DCHECK(HasOneRef());
if (!node_map_.empty()) {
NodeMap::const_iterator it = node_map_.begin();
for (; it != node_map_.end(); ++it) {
static_cast<CefDOMNodeImpl*>(it->second)->Detach();
for (const auto& [web_node, dom_node] : node_map_) {
static_cast<CefDOMNodeImpl*>(dom_node)->Detach();
}
node_map_.clear();
}
libcef/renderer/render_manager.cc
+6 -11
View File
@@ -162,11 +162,10 @@ CefRefPtr<CefBrowserImpl> CefRenderManager::GetBrowserForView(
CefRefPtr<CefBrowserImpl> CefRenderManager::GetBrowserForMainFrame(
blink::WebFrame* frame) {
BrowserMap::const_iterator it = browsers_.begin();
for (; it != browsers_.end(); ++it) {
auto web_view = it->second->GetWebView();
for (const auto& [view, browser] : browsers_) {
auto web_view = browser->GetWebView();
if (web_view && web_view->MainFrame() == frame) {
return it->second;
return browser;
}
}
@@ -228,9 +227,7 @@ void CefRenderManager::WebKitInitialized() {
if (!schemes->empty()) {
// Register the custom schemes. Some attributes are excluded here because
// they use url/url_util.h APIs instead.
CefAppManager::SchemeInfoList::const_iterator it = schemes->begin();
for (; it != schemes->end(); ++it) {
const CefSchemeInfo& info = *it;
for (const auto& info : *schemes) {
const blink::WebString& scheme =
blink::WebString::FromUTF8(info.scheme_name);
if (info.is_display_isolated) {
@@ -349,8 +346,7 @@ CefRefPtr<CefBrowserImpl> CefRenderManager::MaybeCreateBrowser(
}
void CefRenderManager::OnBrowserDestroyed(CefBrowserImpl* browser) {
BrowserMap::iterator it = browsers_.begin();
for (; it != browsers_.end(); ++it) {
for (auto it = browsers_.begin(); it != browsers_.end(); ++it) {
if (it->second.get() == browser) {
browsers_.erase(it);
return;
@@ -373,8 +369,7 @@ CefExcludedView* CefRenderManager::GetExcludedViewForView(
}
void CefRenderManager::OnExcludedViewDestroyed(CefExcludedView* excluded_view) {
ExcludedViewMap::iterator it = excluded_views_.begin();
for (; it != excluded_views_.end(); ++it) {
for (auto it = excluded_views_.begin(); it != excluded_views_.end(); ++it) {
if (it->second.get() == excluded_view) {
excluded_views_.erase(it);
return;
libcef_dll/transfer_util.cc
+4 -7
View File
@@ -37,9 +37,8 @@ void transfer_string_map_contents(cef_string_map_t fromMap, StringMap& toMap) {
void transfer_string_map_contents(const StringMap& fromMap,
cef_string_map_t toMap) {
StringMap::const_iterator it = fromMap.begin();
for (; it != fromMap.end(); ++it) {
cef_string_map_append(toMap, it->first.GetStruct(), it->second.GetStruct());
for (const auto& [key, value] : fromMap) {
cef_string_map_append(toMap, key.GetStruct(), value.GetStruct());
}
}
@@ -58,9 +57,7 @@ void transfer_string_multimap_contents(cef_string_multimap_t fromMap,
void transfer_string_multimap_contents(const StringMultimap& fromMap,
cef_string_multimap_t toMap) {
StringMultimap::const_iterator it = fromMap.begin();
for (; it != fromMap.end(); ++it) {
cef_string_multimap_append(toMap, it->first.GetStruct(),
it->second.GetStruct());
for (const auto& [key, value] : fromMap) {
cef_string_multimap_append(toMap, key.GetStruct(), value.GetStruct());
}
}
libcef_dll/wrapper/cef_browser_info_map.h
+7 -14
View File
@@ -203,10 +203,8 @@ class CefBrowserInfoMap {
}
size_t size = 0;
typename BrowserInfoMap::const_iterator it_browser =
browser_info_map_.begin();
for (; it_browser != browser_info_map_.end(); ++it_browser) {
size += it_browser->second->size();
for (const auto& [browser_id, info_map] : browser_info_map_) {
size += info_map->size();
}
return size;
}
@@ -233,13 +231,9 @@ class CefBrowserInfoMap {
return;
}
typename BrowserInfoMap::const_iterator it_browser =
browser_info_map_.begin();
for (; it_browser != browser_info_map_.end(); ++it_browser) {
InfoMap* info_map = it_browser->second;
typename InfoMap::const_iterator it_info = info_map->begin();
for (; it_info != info_map->end(); ++it_info) {
Traits::Destruct(it_info->second);
for (const auto& [browser_id, info_map] : browser_info_map_) {
for (const auto& [info_id, info] : *info_map) {
Traits::Destruct(info);
}
delete info_map;
}
@@ -260,9 +254,8 @@ class CefBrowserInfoMap {
}
InfoMap* info_map = it_browser->second;
typename InfoMap::const_iterator it_info = info_map->begin();
for (; it_info != info_map->end(); ++it_info) {
Traits::Destruct(it_info->second);
for (const auto& [info_id, info] : *info_map) {
Traits::Destruct(info);
}
browser_info_map_.erase(it_browser);
libcef_dll/wrapper/cef_resource_manager.cc
+5 -9
View File
@@ -260,9 +260,8 @@ class ArchiveProvider : public CefResourceManager::Provider {
if (!pending_requests_.empty()) {
// Continue all pending requests.
PendingRequests::const_iterator it = pending_requests_.begin();
for (; it != pending_requests_.end(); ++it) {
ContinueRequest(*it);
for (const auto& request : pending_requests_) {
ContinueRequest(request);
}
pending_requests_.clear();
}
@@ -444,9 +443,8 @@ CefResourceManager::~CefResourceManager() {
// Delete all entryies now. Requests may still be pending but they will not
// call back into this manager due to the use of WeakPtr.
if (!providers_.empty()) {
ProviderEntryList::iterator it = providers_.begin();
for (; it != providers_.end(); ++it) {
delete *it;
for (auto* entry : providers_) {
delete entry;
}
providers_.clear();
}
@@ -760,9 +758,7 @@ void CefResourceManager::DeleteProvider(ProviderEntryList::iterator& iterator,
current_entry->deletion_pending_ = true;
// Continue pending requests immediately.
RequestList::iterator it = current_entry->pending_requests_.begin();
for (; it != current_entry->pending_requests_.end(); ++it) {
const scoped_refptr<Request>& request = *it;
for (const auto& request : current_entry->pending_requests_) {
if (request->HasState()) {
if (stop) {
request->Stop();
libcef_dll/wrapper/cef_xml_object.cc
+5 -7
View File
@@ -194,19 +194,17 @@ void CefXmlObject::Append(CefRefPtr<CefXmlObject> object,
if (object->HasChildren()) {
ObjectVector children;
object->GetChildren(children);
ObjectVector::const_iterator it = children.begin();
for (; it != children.end(); ++it) {
AddChild((*it)->Duplicate());
for (const auto& child : children) {
AddChild(child->Duplicate());
}
}
if (object->HasAttributes()) {
AttributeMap attributes;
object->GetAttributes(attributes);
AttributeMap::const_iterator it = attributes.begin();
for (; it != attributes.end(); ++it) {
if (overwriteAttributes || !HasAttribute(it->first)) {
SetAttributeValue(it->first, it->second);
for (const auto& [key, value] : attributes) {
if (overwriteAttributes || !HasAttribute(key)) {
SetAttributeValue(key, value);
}
}
}
tests/cefclient/browser/client_handler.cc
+3 -5
View File
@@ -1203,12 +1203,10 @@ bool ClientHandler::OnSelectClientCertificate(
return true;
}
std::vector<CefRefPtr<CefX509Certificate>>::const_iterator it =
certificates.begin();
for (; it != certificates.end(); ++it) {
CefString subject((*it)->GetSubject()->GetDisplayName());
for (const auto& cert : certificates) {
CefString subject(cert->GetSubject()->GetDisplayName());
if (subject == cert_name) {
callback->Select(*it);
callback->Select(cert);
return true;
}
}
tests/cefclient/browser/image_cache.cc
+3 -10
View File
@@ -106,10 +106,7 @@ void ImageCache::LoadImages(const ImageInfoSet& image_info,
ImageSet images;
bool missing_images = false;
ImageInfoSet::const_iterator it = image_info.begin();
for (; it != image_info.end(); ++it) {
const ImageInfo& info = *it;
for (const auto& info : image_info) {
if (info.id_ == kEmptyId) {
// Image intentionally left empty.
images.push_back(nullptr);
@@ -206,9 +203,7 @@ bool ImageCache::LoadImageContents(const ImageInfo& info,
ImageContent* content) {
CEF_REQUIRE_FILE_USER_BLOCKING_THREAD();
ImageRepSet::const_iterator it = info.reps_.begin();
for (; it != info.reps_.end(); ++it) {
const ImageRep& rep = *it;
for (const auto& rep : info.reps_) {
ImageType rep_type;
std::string rep_contents;
if (!LoadImageContents(rep.path_, info.internal_, &rep_type,
@@ -289,9 +284,7 @@ CefRefPtr<CefImage> ImageCache::CreateImage(const std::string& image_id,
CefRefPtr<CefImage> image = CefImage::CreateImage();
ImageContent::RepContentSet::const_iterator it = content.contents_.begin();
for (; it != content.contents_.end(); ++it) {
const ImageContent::RepContent& rep = *it;
for (const auto& rep : content.contents_) {
if (rep.type_ == TYPE_PNG) {
if (!image->AddPNG(rep.scale_factor_, rep.contents_.c_str(),
rep.contents_.size())) {
tests/cefclient/browser/media_router_test.cc
+12 -19
View File
@@ -189,9 +189,7 @@ class MediaObserver : public CefMediaObserver {
return;
}
MediaSinkVector::const_iterator it = sinks.begin();
for (size_t idx = 0; it != sinks.end(); ++it, ++idx) {
CefRefPtr<CefMediaSink> sink = *it;
for (const auto& sink : sinks) {
const std::string& sink_id = sink->GetId();
SinkInfo* info = new SinkInfo;
info->sink = sink;
@@ -214,9 +212,8 @@ class MediaObserver : public CefMediaObserver {
CefRefPtr<CefListValue> routes_list = CefListValue::Create();
routes_list->SetSize(routes.size());
MediaRouteVector::const_iterator it = routes.begin();
for (size_t idx = 0; it != routes.end(); ++it, ++idx) {
CefRefPtr<CefMediaRoute> route = *it;
size_t idx = 0;
for (const auto& route : routes) {
const std::string& route_id = route->GetId();
route_map_.insert(std::make_pair(route_id, route));
@@ -224,7 +221,7 @@ class MediaObserver : public CefMediaObserver {
route_dict->SetString("id", route_id);
route_dict->SetString(kSourceKey, route->GetSource()->GetId());
route_dict->SetString(kSinkKey, route->GetSink()->GetId());
routes_list->SetDictionary(idx, route_dict);
routes_list->SetDictionary(idx++, route_dict);
}
payload->SetList("routes_list", routes_list);
@@ -272,9 +269,8 @@ class MediaObserver : public CefMediaObserver {
}
void ClearSinkInfoMap() {
SinkInfoMap::const_iterator it = sink_info_map_.begin();
for (; it != sink_info_map_.end(); ++it) {
delete it->second;
for (const auto& [key, value] : sink_info_map_) {
delete value;
}
sink_info_map_.clear();
}
@@ -320,12 +316,10 @@ class MediaObserver : public CefMediaObserver {
CefRefPtr<CefListValue> sinks_list = CefListValue::Create();
sinks_list->SetSize(sink_info_map_.size());
SinkInfoMap::const_iterator it = sink_info_map_.begin();
for (size_t idx = 0; it != sink_info_map_.end(); ++it, ++idx) {
const SinkInfo* info = it->second;
size_t idx = 0;
for (const auto& [sink_id, info] : sink_info_map_) {
CefRefPtr<CefDictionaryValue> sink_dict = CefDictionaryValue::Create();
sink_dict->SetString("id", it->first);
sink_dict->SetString("id", sink_id);
sink_dict->SetString("name", info->sink->GetName());
sink_dict->SetInt("icon", info->sink->GetIconType());
sink_dict->SetString("ip_address",
@@ -336,7 +330,7 @@ class MediaObserver : public CefMediaObserver {
sink_dict->SetString("type", info->sink->IsCastSink() ? "cast"
: info->sink->IsDialSink() ? "dial"
: "unknown");
sinks_list->SetDictionary(idx, sink_dict);
sinks_list->SetDictionary(idx++, sink_dict);
}
payload->SetList("sinks_list", sinks_list);
@@ -376,9 +370,8 @@ class Handler : public CefMessageRouterBrowserSide::Handler {
Handler() { CEF_REQUIRE_UI_THREAD(); }
~Handler() override {
SubscriptionStateMap::iterator it = subscription_state_map_.begin();
for (; it != subscription_state_map_.end(); ++it) {
delete it->second;
for (const auto& [key, value] : subscription_state_map_) {
delete value;
}
}
tests/cefclient/browser/osr_renderer.cc
+1 -3
View File
@@ -1017,9 +1017,7 @@ void OsrRenderer::OnPaint(CefRefPtr<CefBrowser> browser,
VERIFY_NO_ERROR;
} else {
// Update just the dirty rectangles.
CefRenderHandler::RectList::const_iterator i = dirtyRects.begin();
for (; i != dirtyRects.end(); ++i) {
const CefRect& rect = *i;
for (const auto& rect : dirtyRects) {
DCHECK(rect.x + rect.width <= view_width_);
DCHECK(rect.y + rect.height <= view_height_);
glPixelStorei(GL_UNPACK_SKIP_PIXELS, rect.x);
tests/cefclient/browser/osr_window_win.cc
+2 -3
View File
@@ -1139,9 +1139,8 @@ void OsrWindowWin::OnImeCompositionRangeChanged(
if (ime_handler_) {
// Convert from view coordinates to device coordinates.
CefRenderHandler::RectList device_bounds;
CefRenderHandler::RectList::const_iterator it = character_bounds.begin();
for (; it != character_bounds.end(); ++it) {
device_bounds.push_back(LogicalToDevice(*it, device_scale_factor_));
for (const auto& bounds : character_bounds) {
device_bounds.push_back(LogicalToDevice(bounds, device_scale_factor_));
}
ime_handler_->ChangeCompositionRange(selection_range, device_bounds);
tests/cefclient/browser/root_window_win.cc
+5 -6
View File
@@ -1461,13 +1461,12 @@ void RootWindowWin::OnSetDraggableRegions(
::SetRectRgn(draggable_region_, 0, 0, 0, 0);
// Determine new draggable region.
std::vector<CefDraggableRegion>::const_iterator it = regions.begin();
for (; it != regions.end(); ++it) {
HRGN region = ::CreateRectRgn(it->bounds.x, it->bounds.y,
it->bounds.x + it->bounds.width,
it->bounds.y + it->bounds.height);
for (const auto& draggable : regions) {
HRGN region = ::CreateRectRgn(draggable.bounds.x, draggable.bounds.y,
draggable.bounds.x + draggable.bounds.width,
draggable.bounds.y + draggable.bounds.height);
::CombineRgn(draggable_region_, draggable_region_, region,
it->draggable ? RGN_OR : RGN_DIFF);
draggable.draggable ? RGN_OR : RGN_DIFF);
::DeleteObject(region);
}
tests/cefclient/browser/test_runner.cc
+6 -12
View File
@@ -618,10 +618,8 @@ std::string DumpRequestContents(CefRefPtr<CefRequest> request) {
request->GetHeaderMap(headerMap);
if (headerMap.size() > 0) {
ss << "\nHeaders:";
CefRequest::HeaderMap::const_iterator it = headerMap.begin();
for (; it != headerMap.end(); ++it) {
ss << "\n\t" << std::string((*it).first) << ": "
<< std::string((*it).second);
for (const auto& [key, value] : headerMap) {
ss << "\n\t" << std::string(key) << ": " << std::string(value);
}
}
@@ -631,10 +629,7 @@ std::string DumpRequestContents(CefRefPtr<CefRequest> request) {
postData->GetElements(elements);
if (elements.size() > 0) {
ss << "\nPost Data:";
CefRefPtr<CefPostDataElement> element;
CefPostData::ElementVector::const_iterator it = elements.begin();
for (; it != elements.end(); ++it) {
element = (*it);
for (const auto& element : elements) {
if (element->GetType() == PDE_TYPE_BYTES) {
// the element is composed of bytes
ss << "\n\tBytes: ";
@@ -669,11 +664,10 @@ CefRefPtr<CefStreamReader> GetDumpResponse(
CefRequest::HeaderMap requestMap;
request->GetHeaderMap(requestMap);
CefRequest::HeaderMap::const_iterator it = requestMap.begin();
for (; it != requestMap.end(); ++it) {
const std::string& key = AsciiStrToLower(it->first);
for (const auto& [header_key, header_value] : requestMap) {
const std::string& key = AsciiStrToLower(header_key);
if (key == "origin") {
origin = it->second;
origin = header_value;
break;
}
}
tests/cefsimple/simple_handler.cc
+2 -3
View File
@@ -166,9 +166,8 @@ void SimpleHandler::CloseAllBrowsers(bool force_close) {
return;
}
BrowserList::const_iterator it = browser_list_.begin();
for (; it != browser_list_.end(); ++it) {
(*it)->GetHost()->CloseBrowser(force_close);
for (const auto& browser : browser_list_) {
browser->GetHost()->CloseBrowser(force_close);
}
}
tests/ceftests/command_line_unittest.cc
+9 -13
View File
@@ -36,23 +36,19 @@ void VerifyCommandLine(CefRefPtr<CefCommandLine> command_line,
bool has1 = false, has2 = false, has3 = false, has4 = false;
CefCommandLine::SwitchMap::const_iterator it = switches.begin();
for (; it != switches.end(); ++it) {
std::string name = it->first;
std::string val = it->second;
if (name == "switch1") {
for (const auto& entry : switches) {
if (entry.first == "switch1") {
has1 = true;
EXPECT_EQ("", val);
} else if (name == "switch2") {
EXPECT_STREQ("", entry.second.ToString().c_str());
} else if (entry.first == "switch2") {
has2 = true;
EXPECT_EQ("VAL2", val);
} else if (name == "switch3") {
EXPECT_STREQ("VAL2", entry.second.ToString().c_str());
} else if (entry.first == "switch3") {
has3 = true;
EXPECT_EQ("val3", val);
} else if (name == "switch4") {
EXPECT_STREQ("val3", entry.second.ToString().c_str());
} else if (entry.first == "switch4") {
has4 = true;
EXPECT_EQ("val 4", val);
EXPECT_STREQ("val 4", entry.second.ToString().c_str());
}
}
tests/ceftests/cookie_unittest.cc
+5 -7
View File
@@ -138,10 +138,9 @@ void SetCookies(CefRefPtr<CefCookieManager> manager,
const CookieVector& cookies,
bool expected_success,
CefRefPtr<CefWaitableEvent> event) {
CookieVector::const_iterator it = cookies.begin();
for (; it != cookies.end(); ++it) {
for (const auto& cookie : cookies) {
EXPECT_TRUE(manager->SetCookie(
url, *it, new TestSetCookieCallback(expected_success, event)));
url, cookie, new TestSetCookieCallback(expected_success, event)));
event->Wait();
}
}
@@ -369,16 +368,15 @@ void TestMultipleCookies(CefRefPtr<CefCookieManager> manager,
EXPECT_EQ((CookieVector::size_type)kNumCookies, cookies.size());
CookieVector::const_iterator it = cookies.begin();
for (i = 0; it != cookies.end(); ++it, ++i) {
const CefCookie& cookie = *it;
i = 0;
for (const auto& cookie : cookies) {
ss << "my_cookie" << i;
EXPECT_EQ(CefString(&cookie.name), ss.str());
ss.str("");
ss << "My Value " << i;
EXPECT_EQ(CefString(&cookie.value), ss.str());
ss.str("");
++i;
}
cookies.clear();
tests/ceftests/cors_unittest.cc
+5 -12
View File
@@ -253,9 +253,7 @@ struct TestSetup {
}
const std::string& path_url = test_request::GetPathURL(url);
ResourceList::const_iterator it = resources.begin();
for (; it != resources.end(); ++it) {
Resource* resource = *it;
for (const auto& resource : resources) {
if (resource->GetPathURL() == path_url &&
(resource->method.empty() ||
matching_methods.contains(resource->method))) {
@@ -279,9 +277,7 @@ struct TestSetup {
// Returns true if the server will be used.
virtual bool NeedsServer() const {
ResourceList::const_iterator it = resources.begin();
for (; it != resources.end(); ++it) {
Resource* resource = *it;
for (const auto& resource : resources) {
if (resource->handler == HandlerType::SERVER) {
return true;
}
@@ -303,9 +299,7 @@ struct TestSetup {
if (!GotAllExpectedConsoleMessages()) {
return false;
}
ResourceList::const_iterator it = resources.begin();
for (; it != resources.end(); ++it) {
Resource* resource = *it;
for (const auto& resource : resources) {
if (!resource->IsDone()) {
return false;
}
@@ -315,9 +309,8 @@ struct TestSetup {
void AssertDone() const {
EXPECT_TRUE(GotAllExpectedConsoleMessages());
ResourceList::const_iterator it = resources.begin();
for (; it != resources.end(); ++it) {
(*it)->AssertDone();
for (const auto& resource : resources) {
resource->AssertDone();
}
}
tests/ceftests/frame_handler_unittest.cc
+14 -20
View File
@@ -993,9 +993,8 @@ class FrameStatusMap {
}
void OnBeforeClose(CefRefPtr<CefBrowser> browser) {
Map::const_iterator it = frame_map_.begin();
for (; it != frame_map_.end(); ++it) {
it->second->OnBeforeClose(browser);
for (const auto& [id, status] : frame_map_) {
status->OnBeforeClose(browser);
}
}
@@ -1012,12 +1011,11 @@ class FrameStatusMap {
return false;
}
Map::const_iterator it = frame_map_.begin();
for (; it != frame_map_.end(); ++it) {
if (!it->second->AllQueriesDelivered(msg)) {
for (const auto& [id, status] : frame_map_) {
if (!status->AllQueriesDelivered(msg)) {
#if VERBOSE_DEBUGGING
if (msg) {
*msg += " " + it->second->GetDebugString() + " PENDING";
*msg += " " + status->GetDebugString() + " PENDING";
}
#endif
return false;
@@ -1040,12 +1038,11 @@ class FrameStatusMap {
return false;
}
Map::const_iterator it = frame_map_.begin();
for (; it != frame_map_.end(); ++it) {
if (!it->second->IsTemporary() && !it->second->IsLoaded(msg)) {
for (const auto& [id, status] : frame_map_) {
if (!status->IsTemporary() && !status->IsLoaded(msg)) {
#if VERBOSE_DEBUGGING
if (msg) {
*msg += " " + it->second->GetDebugString() + " PENDING";
*msg += " " + status->GetDebugString() + " PENDING";
}
#endif
return false;
@@ -1060,9 +1057,8 @@ class FrameStatusMap {
return false;
}
Map::const_iterator it = frame_map_.begin();
for (; it != frame_map_.end(); ++it) {
if (!it->second->IsDestroyed()) {
for (const auto& [id, status] : frame_map_) {
if (!status->IsDestroyed()) {
return false;
}
}
@@ -1072,10 +1068,9 @@ class FrameStatusMap {
void VerifyAndClearTestResults() {
EXPECT_EQ(expected_frame_ct_, size());
Map::const_iterator it = frame_map_.begin();
for (; it != frame_map_.end(); ++it) {
it->second->VerifyTestResults();
delete it->second;
for (const auto& [id, status] : frame_map_) {
status->VerifyTestResults();
delete status;
}
frame_map_.clear();
}
@@ -1347,8 +1342,7 @@ class OrderSubTestHandler : public NavigateOrderMainTestHandler {
map->VerifyAndClearTestResults();
bool found = false;
FrameStatusMapVector::iterator it = frame_maps_.begin();
for (; it != frame_maps_.end(); ++it) {
for (auto it = frame_maps_.begin(); it != frame_maps_.end(); ++it) {
if ((*it).get() == map) {
frame_maps_.erase(it);
found = true;
tests/ceftests/message_router_multi_query_unittest.cc
+13 -19
View File
@@ -602,9 +602,8 @@ class MultiQueryManager {
// iterating.
ObserverSet observer_set = observer_set_;
ObserverSet::const_iterator it = observer_set.begin();
for (; it != observer_set.end(); ++it) {
(*it)->OnManualQueriesCompleted(this);
for (const auto& observer : observer_set) {
observer->OnManualQueriesCompleted(this);
}
}
@@ -617,9 +616,8 @@ class MultiQueryManager {
// iterating.
ObserverSet observer_set = observer_set_;
ObserverSet::const_iterator it = observer_set.begin();
for (; it != observer_set.end(); ++it) {
(*it)->OnAllQueriesCompleted(this);
for (const auto& observer : observer_set) {
observer->OnAllQueriesCompleted(this);
}
}
@@ -1548,9 +1546,8 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
// iterating.
ObserverSet observer_set = observer_set_;
ObserverSet::const_iterator it = observer_set.begin();
for (; it != observer_set.end(); ++it) {
(*it)->OnMapManualQueriesCompleted(this);
for (const auto& observer : observer_set) {
observer->OnMapManualQueriesCompleted(this);
}
}
}
@@ -1568,9 +1565,8 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
// iterating.
ObserverSet observer_set = observer_set_;
ObserverSet::const_iterator it = observer_set.begin();
for (; it != observer_set.end(); ++it) {
(*it)->OnMapAllQueriesCompleted(this);
for (const auto& observer : observer_set) {
observer->OnMapAllQueriesCompleted(this);
}
}
}
@@ -1616,8 +1612,8 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
MultiQueryManager* next_manager = nullptr;
// Find the pending manager that matches the expected URL.
ManagerList::iterator it = pending_managers_.begin();
for (; it != pending_managers_.end(); ++it) {
for (auto it = pending_managers_.begin(); it != pending_managers_.end();
++it) {
if ((*it)->label() == expected_url) {
next_manager = *it;
pending_managers_.erase(it);
@@ -1653,8 +1649,7 @@ class MultiQueryManagerMap : public MultiQueryManager::Observer {
frame->IsMain() ? std::string() : frame->GetIdentifier().ToString();
// Find the manager in the active map.
ManagerMap::const_iterator it =
manager_map_.find(std::make_pair(browser_id, frame_id));
auto it = manager_map_.find(std::make_pair(browser_id, frame_id));
EXPECT_NE(it, manager_map_.end())
<< "browser_id = " << browser_id << ", frame_id = " << frame_id;
return it->second;
@@ -1939,9 +1934,8 @@ class MultiQueryMultiLoadTestHandler
BrowserMap browser_map;
GetAllBrowsers(&browser_map);
BrowserMap::const_iterator it = browser_map.begin();
for (; it != browser_map.end(); ++it) {
it->second->GetMainFrame()->LoadURL(cancel_url_);
for (const auto& [id, browser] : browser_map) {
browser->GetMainFrame()->LoadURL(cancel_url_);
}
}
}
tests/ceftests/request_unittest.cc
+3 -4
View File
@@ -70,12 +70,11 @@ TEST(RequestTest, SetGet) {
EXPECT_EQ((size_t)2, postData->GetElementCount());
CefPostData::ElementVector elements;
postData->GetElements(elements);
CefPostData::ElementVector::const_iterator it = elements.begin();
for (size_t i = 0; it != elements.end(); ++it, ++i) {
for (size_t i = 0; i < elements.size(); ++i) {
if (i == 0) {
TestPostDataElementEqual(element1, (*it).get());
TestPostDataElementEqual(element1, elements[i].get());
} else if (i == 1) {
TestPostDataElementEqual(element2, (*it).get());
TestPostDataElementEqual(element2, elements[i].get());
}
}
tests/ceftests/server_unittest.cc
+25 -40
View File
@@ -84,18 +84,14 @@ class TestServerHandler : public CefServerHandler {
EXPECT_UI_THREAD();
if (!http_request_handler_list_.empty()) {
HttpRequestHandlerList::const_iterator it =
http_request_handler_list_.begin();
for (; it != http_request_handler_list_.end(); ++it) {
delete *it;
for (const auto& handler : http_request_handler_list_) {
delete handler;
}
}
if (!ws_request_handler_list_.empty()) {
WsRequestHandlerList::const_iterator it =
ws_request_handler_list_.begin();
for (; it != ws_request_handler_list_.end(); ++it) {
delete *it;
for (const auto& handler : ws_request_handler_list_) {
delete handler;
}
}
@@ -240,11 +236,9 @@ class TestServerHandler : public CefServerHandler {
EXPECT_TRUE(VerifyRequest(request, false));
bool handled = false;
HttpRequestHandlerList::const_iterator it =
http_request_handler_list_.begin();
for (; it != http_request_handler_list_.end(); ++it) {
handled =
(*it)->HandleRequest(server, connection_id, client_address, request);
for (const auto& handler : http_request_handler_list_) {
handled = handler->HandleRequest(server, connection_id, client_address,
request);
if (handled) {
break;
}
@@ -270,10 +264,9 @@ class TestServerHandler : public CefServerHandler {
ws_connection_id_set_.insert(connection_id);
bool handled = false;
WsRequestHandlerList::const_iterator it = ws_request_handler_list_.begin();
for (; it != ws_request_handler_list_.end(); ++it) {
handled = (*it)->HandleRequest(server, connection_id, client_address,
request, callback);
for (const auto& handler : ws_request_handler_list_) {
handled = handler->HandleRequest(server, connection_id, client_address,
request, callback);
if (handled) {
break;
}
@@ -293,9 +286,8 @@ class TestServerHandler : public CefServerHandler {
ws_connection_id_set_.end());
bool handled = false;
WsRequestHandlerList::const_iterator it = ws_request_handler_list_.begin();
for (; it != ws_request_handler_list_.end(); ++it) {
handled = (*it)->HandleConnected(server, connection_id);
for (const auto& handler : ws_request_handler_list_) {
handled = handler->HandleConnected(server, connection_id);
if (handled) {
break;
}
@@ -318,9 +310,8 @@ class TestServerHandler : public CefServerHandler {
ws_connection_id_set_.end());
bool handled = false;
WsRequestHandlerList::const_iterator it = ws_request_handler_list_.begin();
for (; it != ws_request_handler_list_.end(); ++it) {
handled = (*it)->HandleMessage(server, connection_id, data, data_size);
for (const auto& handler : ws_request_handler_list_) {
handled = handler->HandleMessage(server, connection_id, data, data_size);
if (handled) {
break;
}
@@ -384,11 +375,9 @@ class TestServerHandler : public CefServerHandler {
EXPECT_EQ(expected_http_request_ct_, actual_http_request_ct_);
if (!http_request_handler_list_.empty()) {
HttpRequestHandlerList::const_iterator it =
http_request_handler_list_.begin();
for (; it != http_request_handler_list_.end(); ++it) {
EXPECT_TRUE((*it)->VerifyResults())
<< "HttpRequestHandler for " << (*it)->ToString();
for (const auto& handler : http_request_handler_list_) {
EXPECT_TRUE(handler->VerifyResults())
<< "HttpRequestHandler for " << handler->ToString();
}
}
@@ -399,11 +388,9 @@ class TestServerHandler : public CefServerHandler {
EXPECT_EQ(expected_ws_message_ct_, actual_ws_message_ct_);
if (!ws_request_handler_list_.empty()) {
WsRequestHandlerList::const_iterator it =
ws_request_handler_list_.begin();
for (; it != ws_request_handler_list_.end(); ++it) {
EXPECT_TRUE((*it)->VerifyResults())
<< "WsRequestHandler for " << (*it)->ToString();
for (const auto& handler : ws_request_handler_list_) {
EXPECT_TRUE(handler->VerifyResults())
<< "WsRequestHandler for " << handler->ToString();
}
}
}
@@ -538,9 +525,8 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
initialized_ = true;
EXPECT_FALSE(request_runner_map_.empty());
RequestRunnerMap::const_iterator it = request_runner_map_.begin();
for (; it != request_runner_map_.end(); ++it) {
handler_->AddHttpRequestHandler(it->second->CreateHttpRequestHandler());
for (const auto& [id, runner] : request_runner_map_) {
handler_->AddHttpRequestHandler(runner->CreateHttpRequestHandler());
}
handler_->SetExpectedConnectionCount(
@@ -573,10 +559,9 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
// Run all requests in parallel.
void RunAllRequests() {
RequestRunnerMap::const_iterator it = request_runner_map_.begin();
for (; it != request_runner_map_.end(); ++it) {
it->second->RunRequest(
base::BindOnce(&HttpTestRunner::OnRequestComplete, this, it->first));
for (const auto& [id, runner] : request_runner_map_) {
runner->RunRequest(
base::BindOnce(&HttpTestRunner::OnRequestComplete, this, id));
}
}
tests/ceftests/string_unittest.cc
+6 -11
View File
@@ -164,9 +164,8 @@ TEST(StringTest, List) {
cef_string_list_t listPtr = cef_string_list_alloc();
EXPECT_TRUE(listPtr != nullptr);
ListType::const_iterator it = list.begin();
for (; it != list.end(); ++it) {
cef_string_list_append(listPtr, it->GetStruct());
for (const auto& item : list) {
cef_string_list_append(listPtr, item.GetStruct());
}
CefString str;
@@ -230,10 +229,8 @@ TEST(StringTest, Map) {
cef_string_map_t mapPtr = cef_string_map_alloc();
it = map.begin();
for (; it != map.end(); ++it) {
cef_string_map_append(mapPtr, it->first.GetStruct(),
it->second.GetStruct());
for (const auto& [key, value] : map) {
cef_string_map_append(mapPtr, key.GetStruct(), value.GetStruct());
}
CefString str;
@@ -306,10 +303,8 @@ TEST(StringTest, Multimap) {
cef_string_multimap_t mapPtr = cef_string_multimap_alloc();
it = map.begin();
for (; it != map.end(); ++it) {
cef_string_multimap_append(mapPtr, it->first.GetStruct(),
it->second.GetStruct());
for (const auto& [key, value] : map) {
cef_string_multimap_append(mapPtr, key.GetStruct(), value.GetStruct());
}
CefString str;
tests/ceftests/test_handler.cc
+8 -14
View File
@@ -220,18 +220,14 @@ void TestHandler::Collection::AddTestHandler(TestHandler* test_handler) {
void TestHandler::Collection::ExecuteTests() {
EXPECT_GT(handler_list_.size(), 0UL);
TestHandlerList::const_iterator it;
it = handler_list_.begin();
for (; it != handler_list_.end(); ++it) {
(*it)->SetupTest();
for (const auto& handler : handler_list_) {
handler->SetupTest();
}
completion_state_->WaitForTests();
it = handler_list_.begin();
for (; it != handler_list_.end(); ++it) {
(*it)->RunTest();
for (const auto& handler : handler_list_) {
handler->RunTest();
}
completion_state_->WaitForTests();
@@ -453,9 +449,8 @@ namespace {
CefResponse::HeaderMap ToCefHeaderMap(
const ResourceContent::HeaderMap& headerMap) {
CefResponse::HeaderMap result;
ResourceContent::HeaderMap::const_iterator it = headerMap.begin();
for (; it != headerMap.end(); ++it) {
result.insert(std::pair<CefString, CefString>(it->first, it->second));
for (const auto& [key, value] : headerMap) {
result.insert(std::pair<CefString, CefString>(key, value));
}
return result;
}
@@ -548,9 +543,8 @@ void TestHandler::DestroyTest() {
BrowserMap browser_map = browser_map_;
// Tell all browsers to close.
BrowserMap::const_iterator it = browser_map.begin();
for (; it != browser_map.end(); ++it) {
CloseBrowser(it->second, false);
for (const auto& [id, browser] : browser_map) {
CloseBrowser(browser, false);
}
}
}
tests/ceftests/test_server_manager.cc
+3 -5
View File
@@ -218,8 +218,7 @@ void Manager::AddObserver(Observer* observer) {
void Manager::RemoveObserver(Observer* observer, DoneCallback callback) {
CEF_REQUIRE_UI_THREAD();
bool found = false;
ObserverList::iterator it = observer_list_.begin();
for (; it != observer_list_.end(); ++it) {
for (auto it = observer_list_.begin(); it != observer_list_.end(); ++it) {
if (*it == observer) {
observer_list_.erase(it);
found = true;
@@ -288,9 +287,8 @@ void Manager::OnTestServerRequest(CefRefPtr<CefRequest> request,
bool handled = false;
ObserverList::const_iterator it = list.begin();
for (; it != list.end(); ++it) {
if ((*it)->OnTestServerRequest(request, response_callback)) {
for (const auto& observer : list) {
if (observer->OnTestServerRequest(request, response_callback)) {
handled = true;
break;
}
tests/ceftests/test_server_unittest.cc
+7 -9
View File
@@ -268,9 +268,8 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
initialized_ = true;
EXPECT_FALSE(request_runner_map_.empty());
RequestRunnerMap::const_iterator it = request_runner_map_.begin();
for (; it != request_runner_map_.end(); ++it) {
handler_->AddHttpRequestHandler(it->second->CreateHttpRequestHandler());
for (const auto& [id, runner] : request_runner_map_) {
handler_->AddHttpRequestHandler(runner->CreateHttpRequestHandler());
}
handler_->SetExpectedHttpRequestCount(
@@ -302,17 +301,16 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
// Run all requests in parallel.
void RunAllRequests() {
RequestRunnerMap::const_iterator it = request_runner_map_.begin();
for (; it != request_runner_map_.end(); ++it) {
it->second->RunRequest(
for (const auto& [id, runner] : request_runner_map_) {
runner->RunRequest(
server_origin_,
base::BindOnce(&HttpTestRunner::OnRequestComplete, this, it->first));
base::BindOnce(&HttpTestRunner::OnRequestComplete, this, id));
}
}
// Run one request at a time.
void RunNextRequest() {
RequestRunnerMap::const_iterator it = request_runner_map_.begin();
auto it = request_runner_map_.begin();
it->second->RunRequest(
server_origin_,
base::BindOnce(&HttpTestRunner::OnRequestComplete, this, it->first));
@@ -327,7 +325,7 @@ class HttpTestRunner : public base::RefCountedThreadSafe<HttpTestRunner> {
}
void OnRequestCompleteContinue(int request_id) {
RequestRunnerMap::iterator it = request_runner_map_.find(request_id);
auto it = request_runner_map_.find(request_id);
EXPECT_TRUE(it != request_runner_map_.end());
// Verify the request results.
tests/ceftests/test_util.cc
+12 -20
View File
@@ -29,28 +29,24 @@ void TestMapEqual(const CefRequest::HeaderMap& map1,
TestMapNoDuplicates(map1);
TestMapNoDuplicates(map2);
CefRequest::HeaderMap::const_iterator it1, it2;
for (it1 = map1.begin(); it1 != map1.end(); ++it1) {
for (const auto& [key1, value1] : map1) {
bool found = false;
std::string name1 = client::AsciiStrToLower(it1->first);
for (it2 = map2.begin(); it2 != map2.end(); ++it2) {
std::string name2 = client::AsciiStrToLower(it2->first);
if (name1 == name2 && it1->second == it2->second) {
std::string name1 = client::AsciiStrToLower(key1);
for (const auto& [key2, value2] : map2) {
std::string name2 = client::AsciiStrToLower(key2);
if (name1 == name2 && value1 == value2) {
found = true;
break;
}
}
EXPECT_TRUE(found) << "No entry for " << it1->first.ToString() << ": "
<< it1->second.ToString();
EXPECT_TRUE(found) << "No entry for " << key1.ToString() << ": "
<< value1.ToString();
}
}
void TestMapNoDuplicates(const CefRequest::HeaderMap& map) {
CefRequest::HeaderMap::const_iterator it1 = map.begin();
for (; it1 != map.end(); ++it1) {
CefRequest::HeaderMap::const_iterator it2 = it1;
for (++it2; it2 != map.end(); ++it2) {
for (auto it1 = map.begin(); it1 != map.end(); ++it1) {
for (auto it2 = std::next(it1); it2 != map.end(); ++it2) {
EXPECT_FALSE(it1->first == it2->first && it1->second == it2->second)
<< "Duplicate entry for " << it1->first.ToString() << ": "
<< it1->second.ToString();
@@ -96,10 +92,8 @@ void TestPostDataEqual(CefRefPtr<CefPostData> postData1,
postData1->GetElements(ev2);
ASSERT_EQ(ev1.size(), ev2.size());
CefPostData::ElementVector::const_iterator it1 = ev1.begin();
CefPostData::ElementVector::const_iterator it2 = ev2.begin();
for (; it1 != ev1.end() && it2 != ev2.end(); ++it1, ++it2) {
TestPostDataElementEqual((*it1), (*it2));
for (size_t i = 0; i < ev1.size(); ++i) {
TestPostDataElementEqual(ev1[i], ev2[i]);
}
}
@@ -189,9 +183,7 @@ void TestDictionaryEqual(CefRefPtr<CefDictionaryValue> val1,
CefDictionaryValue::KeyList keys;
EXPECT_TRUE(val1->GetKeys(keys));
CefDictionaryValue::KeyList::const_iterator it = keys.begin();
for (; it != keys.end(); ++it) {
CefString key = *it;
for (const auto& key : keys) {
EXPECT_TRUE(val2->HasKey(key));
CefValueType type = val1->GetType(key);
EXPECT_EQ(type, val2->GetType(key));
tests/ceftests/urlrequest_unittest.cc
+3 -5
View File
@@ -470,11 +470,9 @@ void GetTestCookie(CefRefPtr<CefRequestContext> request_context,
std::string GetHeaderValue(const CefRequest::HeaderMap& header_map,
const std::string& header_name_lower) {
CefRequest::HeaderMap::const_iterator it = header_map.begin();
for (; it != header_map.end(); ++it) {
std::string name = client::AsciiStrToLower(it->first);
if (name == header_name_lower) {
return it->second;
for (const auto& [key, value] : header_map) {
if (client::AsciiStrToLower(key) == header_name_lower) {
return value;
}
}
return std::string();
tests/ceftests/xml_reader_unittest.cc
+2 -3
View File
@@ -547,9 +547,8 @@ TEST(XmlReaderTest, ObjectLoad) {
ASSERT_EQ(obj->GetChildren(obj_children), (size_t)4);
ASSERT_EQ(obj_children.size(), (size_t)4);
CefXmlObject::ObjectVector::const_iterator it = obj_children.begin();
for (int ct = 0; it != obj_children.end(); ++it, ++ct) {
obj_child = *it;
for (int ct = 0; ct < static_cast<int>(obj_children.size()); ++ct) {
obj_child = obj_children[ct];
ASSERT_TRUE(obj_child.get());
if (ct == 0) {
// ns:objA
tests/shared/browser/client_app_browser.cc
+2 -3
View File
@@ -97,9 +97,8 @@ void ClientAppBrowser::OnBeforeCommandLineProcessing(
}
#endif
DelegateSet::iterator it = delegates_.begin();
for (; it != delegates_.end(); ++it) {
(*it)->OnBeforeCommandLineProcessing(this, command_line);
for (auto& delegate : delegates_) {
delegate->OnBeforeCommandLineProcessing(this, command_line);
}
}
}
tests/shared/renderer/client_app_renderer.cc
+15 -22
View File
@@ -13,25 +13,22 @@ ClientAppRenderer::ClientAppRenderer() {
}
void ClientAppRenderer::OnWebKitInitialized() {
DelegateSet::iterator it = delegates_.begin();
for (; it != delegates_.end(); ++it) {
(*it)->OnWebKitInitialized(this);
for (auto& delegate : delegates_) {
delegate->OnWebKitInitialized(this);
}
}
void ClientAppRenderer::OnBrowserCreated(
CefRefPtr<CefBrowser> browser,
CefRefPtr<CefDictionaryValue> extra_info) {
DelegateSet::iterator it = delegates_.begin();
for (; it != delegates_.end(); ++it) {
(*it)->OnBrowserCreated(this, browser, extra_info);
for (auto& delegate : delegates_) {
delegate->OnBrowserCreated(this, browser, extra_info);
}
}
void ClientAppRenderer::OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) {
DelegateSet::iterator it = delegates_.begin();
for (; it != delegates_.end(); ++it) {
(*it)->OnBrowserDestroyed(this, browser);
for (auto& delegate : delegates_) {
delegate->OnBrowserDestroyed(this, browser);
}
}
@@ -48,18 +45,16 @@ CefRefPtr<CefLoadHandler> ClientAppRenderer::GetLoadHandler() {
void ClientAppRenderer::OnContextCreated(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefV8Context> context) {
DelegateSet::iterator it = delegates_.begin();
for (; it != delegates_.end(); ++it) {
(*it)->OnContextCreated(this, browser, frame, context);
for (auto& delegate : delegates_) {
delegate->OnContextCreated(this, browser, frame, context);
}
}
void ClientAppRenderer::OnContextReleased(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefV8Context> context) {
DelegateSet::iterator it = delegates_.begin();
for (; it != delegates_.end(); ++it) {
(*it)->OnContextReleased(this, browser, frame, context);
for (auto& delegate : delegates_) {
delegate->OnContextReleased(this, browser, frame, context);
}
}
@@ -69,19 +64,17 @@ void ClientAppRenderer::OnUncaughtException(
CefRefPtr<CefV8Context> context,
CefRefPtr<CefV8Exception> exception,
CefRefPtr<CefV8StackTrace> stackTrace) {
DelegateSet::iterator it = delegates_.begin();
for (; it != delegates_.end(); ++it) {
(*it)->OnUncaughtException(this, browser, frame, context, exception,
stackTrace);
for (auto& delegate : delegates_) {
delegate->OnUncaughtException(this, browser, frame, context, exception,
stackTrace);
}
}
void ClientAppRenderer::OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame,
CefRefPtr<CefDOMNode> node) {
DelegateSet::iterator it = delegates_.begin();
for (; it != delegates_.end(); ++it) {
(*it)->OnFocusedNodeChanged(this, browser, frame, node);
for (auto& delegate : delegates_) {
delegate->OnFocusedNodeChanged(this, browser, frame, node);
}
}