From 237cb7d0a37772d63c53c1bfda03f62e7cace16f Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Fri, 6 Jan 2017 23:28:49 +0530 Subject: [PATCH] interceptor should handle default values of download and upload throughput --- .../browser/net/devtools_network_interceptor.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/brightray/browser/net/devtools_network_interceptor.cc b/brightray/browser/net/devtools_network_interceptor.cc index fa866b4aa12..f0e3e0e488d 100644 --- a/brightray/browser/net/devtools_network_interceptor.cc +++ b/brightray/browser/net/devtools_network_interceptor.cc @@ -195,15 +195,20 @@ base::TimeTicks DevToolsNetworkInterceptor::CalculateDesiredTime( void DevToolsNetworkInterceptor::ArmTimer(base::TimeTicks now) { size_t suspend_count = suspended_.size(); - if (!download_.size() && !upload_.size() && !suspend_count) + if (!download_.size() && !upload_.size() && !suspend_count) { + timer_.Stop(); return; + } base::TimeTicks desired_time = CalculateDesiredTime( download_, download_last_tick_, download_tick_length_); + if (desired_time == offset_) { + FinishRecords(&download_, false); + } base::TimeTicks upload_time = CalculateDesiredTime( upload_, upload_last_tick_, upload_tick_length_); - if (upload_time < desired_time) + if (upload_time != offset_ && upload_time < desired_time) desired_time = upload_time; int64_t min_baseline = std::numeric_limits::max(); @@ -218,9 +223,9 @@ void DevToolsNetworkInterceptor::ArmTimer(base::TimeTicks now) { desired_time = activation_time; } - timer_.Start(FROM_HERE, desired_time - now, - base::Bind(&DevToolsNetworkInterceptor::OnTimer, - base::Unretained(this))); + timer_.Start( + FROM_HERE, (desired_time - now).magnitude(), + base::Bind(&DevToolsNetworkInterceptor::OnTimer, base::Unretained(this))); } int DevToolsNetworkInterceptor::StartThrottle(