| Index: chrome/browser/devtools/devtools_network_controller.cc
|
| diff --git a/chrome/browser/devtools/devtools_network_controller.cc b/chrome/browser/devtools/devtools_network_controller.cc
|
| index 176ac6655dba216d1251f908d5f0fcba088fceca..566a2108375f611afaff55b1ffea6c4b3dbe7c5e 100644
|
| --- a/chrome/browser/devtools/devtools_network_controller.cc
|
| +++ b/chrome/browser/devtools/devtools_network_controller.cc
|
| @@ -4,52 +4,52 @@
|
|
|
| #include "chrome/browser/devtools/devtools_network_controller.h"
|
|
|
| -#include "base/time/time.h"
|
| #include "chrome/browser/devtools/devtools_network_conditions.h"
|
| +#include "chrome/browser/devtools/devtools_network_interceptor.h"
|
| #include "chrome/browser/devtools/devtools_network_transaction.h"
|
| -#include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/profiles/profile_io_data.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/resource_context.h"
|
| +#include "net/base/load_flags.h"
|
| +#include "net/http/http_request_info.h"
|
|
|
| using content::BrowserThread;
|
|
|
| -namespace {
|
| -
|
| -const char kDevToolsRequestInitiator[] = "X-DevTools-Request-Initiator";
|
| -int64_t kPacketSize = 1500;
|
| -
|
| -} // namespace
|
| -
|
| DevToolsNetworkController::DevToolsNetworkController()
|
| - : weak_ptr_factory_(this) {
|
| + : default_interceptor_(new DevToolsNetworkInterceptor()),
|
| + appcache_interceptor_(new DevToolsNetworkInterceptor()),
|
| + weak_ptr_factory_(this) {
|
| }
|
|
|
| DevToolsNetworkController::~DevToolsNetworkController() {
|
| }
|
|
|
| -void DevToolsNetworkController::AddTransaction(
|
| +base::WeakPtr<DevToolsNetworkInterceptor>
|
| +DevToolsNetworkController::GetInterceptor(
|
| DevToolsNetworkTransaction* transaction) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - transactions_.insert(transaction);
|
| -}
|
| + DCHECK(transaction->request());
|
|
|
| -void DevToolsNetworkController::RemoveTransaction(
|
| - DevToolsNetworkTransaction* transaction) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(transactions_.find(transaction) != transactions_.end());
|
| - transactions_.erase(transaction);
|
| -
|
| - if (conditions_ && conditions_->IsThrottling()) {
|
| - UpdateThrottles();
|
| - throttled_transactions_.erase(std::remove(throttled_transactions_.begin(),
|
| - throttled_transactions_.end(), transaction),
|
| - throttled_transactions_.end());
|
| - ArmTimer();
|
| - }
|
| + if (!interceptors_.size())
|
| + return default_interceptor_->GetWeakPtr();
|
| +
|
| + if (transaction->request()->load_flags & net::LOAD_DISABLE_INTERCEPT)
|
| + return appcache_interceptor_->GetWeakPtr();
|
| +
|
| + transaction->ProcessRequest();
|
| +
|
| + const std::string& client_id = transaction->client_id();
|
| + if (client_id.empty())
|
| + return default_interceptor_->GetWeakPtr();
|
| +
|
| + DevToolsNetworkInterceptor* interceptor = interceptors_.get(client_id);
|
| + DCHECK(interceptor);
|
| + if (!interceptor)
|
| + return default_interceptor_->GetWeakPtr();
|
| +
|
| + return interceptor->GetWeakPtr();
|
| }
|
|
|
| void DevToolsNetworkController::SetNetworkState(
|
| + const std::string& client_id,
|
| const scoped_refptr<DevToolsNetworkConditions> conditions) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| BrowserThread::PostTask(
|
| @@ -58,146 +58,47 @@ void DevToolsNetworkController::SetNetworkState(
|
| base::Bind(
|
| &DevToolsNetworkController::SetNetworkStateOnIO,
|
| weak_ptr_factory_.GetWeakPtr(),
|
| + client_id,
|
| conditions));
|
| }
|
|
|
| void DevToolsNetworkController::SetNetworkStateOnIO(
|
| + const std::string& client_id,
|
| const scoped_refptr<DevToolsNetworkConditions> conditions) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - if (conditions_ && conditions_->IsThrottling())
|
| - UpdateThrottles();
|
| -
|
| - conditions_ = conditions;
|
| - if (!conditions || !(conditions->IsThrottling() || conditions->IsOffline())) {
|
| - timer_.Stop();
|
| - int64_t length = throttled_transactions_.size();
|
| - for (int64_t i = 0; i < length; ++i)
|
| - throttled_transactions_[i]->FireThrottledCallback();
|
| - throttled_transactions_.clear();
|
| - }
|
|
|
| - if (!conditions)
|
| - return;
|
| -
|
| - if (conditions_->IsOffline()) {
|
| - // Iterate over a copy of set, because failing of transaction could
|
| - // result in creating a new one, or (theoretically) destroying one.
|
| - Transactions old_transactions(transactions_);
|
| - for (Transactions::iterator it = old_transactions.begin();
|
| - it != old_transactions.end(); ++it) {
|
| - if (transactions_.find(*it) == transactions_.end())
|
| - continue;
|
| - if (!(*it)->request() || (*it)->failed())
|
| - continue;
|
| - if (ShouldFail((*it)->request()))
|
| - (*it)->Fail();
|
| + DevToolsNetworkInterceptor* interceptor = interceptors_.get(client_id);
|
| + if (!interceptor) {
|
| + DCHECK(conditions);
|
| + if (!conditions)
|
| + return;
|
| + Interceptor new_interceptor = Interceptor(new DevToolsNetworkInterceptor());
|
| + new_interceptor->UpdateConditions(conditions);
|
| + interceptors_.set(client_id, new_interceptor.Pass());
|
| + } else {
|
| + if (!conditions) {
|
| + scoped_refptr<DevToolsNetworkConditions> online_conditions(
|
| + new DevToolsNetworkConditions());
|
| + interceptor->UpdateConditions(online_conditions);
|
| + interceptors_.erase(client_id);
|
| + } else {
|
| + interceptor->UpdateConditions(conditions);
|
| }
|
| }
|
|
|
| - if (conditions_->IsThrottling()) {
|
| - DCHECK(conditions_->maximal_throughput() != 0);
|
| - offset_ = base::TimeTicks::Now();
|
| - last_tick_ = 0;
|
| - int64_t us_tick_length =
|
| - (1000000L * kPacketSize) / conditions_->maximal_throughput();
|
| - DCHECK(us_tick_length != 0);
|
| - if (us_tick_length == 0)
|
| - us_tick_length = 1;
|
| - tick_length_ = base::TimeDelta::FromMicroseconds(us_tick_length);
|
| - ArmTimer();
|
| - }
|
| -}
|
| -
|
| -bool DevToolsNetworkController::ShouldFail(
|
| - const net::HttpRequestInfo* request) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(request);
|
| - if (!conditions_ || !conditions_->IsOffline())
|
| - return false;
|
| -
|
| - if (!conditions_->HasMatchingDomain(request->url))
|
| - return false;
|
| -
|
| - return !request->extra_headers.HasHeader(kDevToolsRequestInitiator);
|
| -}
|
| -
|
| -bool DevToolsNetworkController::ShouldThrottle(
|
| - const net::HttpRequestInfo* request) {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(request);
|
| - if (!conditions_ || !conditions_->IsThrottling())
|
| - return false;
|
| -
|
| - if (!conditions_->HasMatchingDomain(request->url))
|
| - return false;
|
| -
|
| - return !request->extra_headers.HasHeader(kDevToolsRequestInitiator);
|
| -}
|
| -
|
| -void DevToolsNetworkController::UpdateThrottles() {
|
| - int64_t last_tick = (base::TimeTicks::Now() - offset_) / tick_length_;
|
| - int64_t ticks = last_tick - last_tick_;
|
| - last_tick_ = last_tick;
|
| -
|
| - int64_t length = throttled_transactions_.size();
|
| - if (!length)
|
| - return;
|
| -
|
| - int64_t shift = ticks % length;
|
| - for (int64_t i = 0; i < length; ++i) {
|
| - throttled_transactions_[i]->DecreaseThrottledByteCount(
|
| - (ticks / length) * kPacketSize + (i < shift ? kPacketSize : 0));
|
| - }
|
| - std::rotate(throttled_transactions_.begin(),
|
| - throttled_transactions_.begin() + shift, throttled_transactions_.end());
|
| -}
|
| -
|
| -void DevToolsNetworkController::OnTimer() {
|
| - UpdateThrottles();
|
| -
|
| - std::vector<DevToolsNetworkTransaction*> active_transactions;
|
| - std::vector<DevToolsNetworkTransaction*> finished_transactions;
|
| - size_t length = throttled_transactions_.size();
|
| - for (size_t i = 0; i < length; ++i) {
|
| - if (throttled_transactions_[i]->throttled_byte_count() < 0)
|
| - finished_transactions.push_back(throttled_transactions_[i]);
|
| - else
|
| - active_transactions.push_back(throttled_transactions_[i]);
|
| + bool has_offline_interceptors = false;
|
| + Interceptors::iterator it = interceptors_.begin();
|
| + for (; it != interceptors_.end(); ++it) {
|
| + if (it->second->conditions()->offline()) {
|
| + has_offline_interceptors = true;
|
| + break;
|
| + }
|
| }
|
| - throttled_transactions_.swap(active_transactions);
|
| -
|
| - length = finished_transactions.size();
|
| - for (size_t i = 0; i < length; ++i)
|
| - finished_transactions[i]->FireThrottledCallback();
|
| -
|
| - ArmTimer();
|
| -}
|
|
|
| -void DevToolsNetworkController::ArmTimer() {
|
| - size_t length = throttled_transactions_.size();
|
| - if (!length)
|
| - return;
|
| - int64_t min_ticks_left = 0x10000L;
|
| - for (size_t i = 0; i < length; ++i) {
|
| - int64_t packets_left = (throttled_transactions_[i]->throttled_byte_count() +
|
| - kPacketSize - 1) / kPacketSize;
|
| - int64_t ticks_left = (i + 1) + length * (packets_left - 1);
|
| - if (i == 0 || ticks_left < min_ticks_left)
|
| - min_ticks_left = ticks_left;
|
| + bool is_appcache_offline = appcache_interceptor_->conditions()->offline();
|
| + if (is_appcache_offline != has_offline_interceptors) {
|
| + scoped_refptr<DevToolsNetworkConditions> appcache_conditions(
|
| + new DevToolsNetworkConditions(has_offline_interceptors));
|
| + appcache_interceptor_->UpdateConditions(appcache_conditions);
|
| }
|
| - base::TimeTicks desired_time =
|
| - offset_ + tick_length_ * (last_tick_ + min_ticks_left);
|
| - timer_.Start(
|
| - FROM_HERE,
|
| - desired_time - base::TimeTicks::Now(),
|
| - base::Bind(
|
| - &DevToolsNetworkController::OnTimer,
|
| - weak_ptr_factory_.GetWeakPtr()));
|
| -}
|
| -
|
| -void DevToolsNetworkController::ThrottleTransaction(
|
| - DevToolsNetworkTransaction* transaction) {
|
| - UpdateThrottles();
|
| - throttled_transactions_.push_back(transaction);
|
| - ArmTimer();
|
| }
|
|
|