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

ScopedPtrHashMap has been removed

Browse source
This commit is contained in:
Cheng Zhao 2017-04-04 13:26:50 +09:00
parent fdb880eca2
commit 0a110a44f9
4 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
brightray/browser/net/devtools_network_controller.cc
View file

@ -27,29 +27,28 @@ void DevToolsNetworkController::SetNetworkState(
std::unique_ptr<DevToolsNetworkConditions> conditions) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DevToolsNetworkInterceptor* interceptor = interceptors_.get(client_id);
if (!interceptor) {
auto it = interceptors_.find(client_id);
if (it == interceptors_.end()) {
if (!conditions)
return;
std::unique_ptr<DevToolsNetworkInterceptor> new_interceptor(
new DevToolsNetworkInterceptor);
new_interceptor->UpdateConditions(std::move(conditions));
interceptors_.set(client_id, std::move(new_interceptor));
interceptors_[client_id] = std::move(new_interceptor);
} else {
if (!conditions) {
std::unique_ptr<DevToolsNetworkConditions> online_conditions(
new DevToolsNetworkConditions(false));
interceptor->UpdateConditions(std::move(online_conditions));
it->second->UpdateConditions(std::move(online_conditions));
interceptors_.erase(client_id);
} else {
interceptor->UpdateConditions(std::move(conditions));
it->second->UpdateConditions(std::move(conditions));
}
}
bool has_offline_interceptors = false;
auto it = interceptors_.begin();
for (; it != interceptors_.end(); ++it) {
if (it->second->IsOffline()) {
for (const auto& interceptor : interceptors_) {
if (interceptor.second->IsOffline()) {
has_offline_interceptors = true;
break;
}
@ -70,11 +69,11 @@ DevToolsNetworkController::GetInterceptor(const std::string& client_id) {
if (interceptors_.empty() || client_id.empty())
return nullptr;
DevToolsNetworkInterceptor* interceptor = interceptors_.get(client_id);
if (!interceptor)
auto it = interceptors_.find(client_id);
if (it == interceptors_.end())
return nullptr;
return interceptor;
return it->second.get();
}
} // namespace brightray