Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: components/scheduler/renderer/throttling_helper.cc

Issue 2246493002: Revert of Change VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/scheduler/renderer/throttling_helper.cc
diff --git a/components/scheduler/renderer/throttling_helper.cc b/components/scheduler/renderer/throttling_helper.cc
index 034a1611ddc14ab34318eb015af2798dc7e76cc4..c5335bfe91c710acf08ac02155afe7fa14f5ed8c 100644
--- a/components/scheduler/renderer/throttling_helper.cc
+++ b/components/scheduler/renderer/throttling_helper.cc
@@ -7,7 +7,6 @@
#include "base/logging.h"
#include "components/scheduler/base/real_time_domain.h"
#include "components/scheduler/child/scheduler_tqm_delegate.h"
-#include "components/scheduler/renderer/auto_advancing_virtual_time_domain.h"
#include "components/scheduler/renderer/renderer_scheduler_impl.h"
#include "components/scheduler/renderer/throttled_time_domain.h"
#include "components/scheduler/renderer/web_frame_scheduler_impl.h"
@@ -22,9 +21,8 @@
tick_clock_(renderer_scheduler->tick_clock()),
tracing_category_(tracing_category),
time_domain_(new ThrottledTimeDomain(this, tracing_category)),
- virtual_time_(false),
weak_factory_(this) {
- pump_throttled_tasks_closure_.Reset(base::Bind(
+ suspend_timers_when_backgrounded_closure_.Reset(base::Bind(
&ThrottlingHelper::PumpThrottledTasks, weak_factory_.GetWeakPtr()));
forward_immediate_work_closure_ =
base::Bind(&ThrottlingHelper::OnTimeDomainHasImmediateWork,
@@ -65,9 +63,6 @@
void ThrottlingHelper::IncreaseThrottleRefCount(TaskQueue* task_queue) {
DCHECK_NE(task_queue, task_runner_.get());
- if (virtual_time_)
- return;
-
std::pair<TaskQueueMap::iterator, bool> insert_result =
throttled_queues_.insert(std::make_pair(
task_queue, Metadata(1, task_queue->IsQueueEnabled())));
@@ -92,9 +87,6 @@
}
void ThrottlingHelper::DecreaseThrottleRefCount(TaskQueue* task_queue) {
- if (virtual_time_)
- return;
-
TaskQueueMap::iterator iter = throttled_queues_.find(task_queue);
if (iter != throttled_queues_.end() &&
@@ -175,9 +167,6 @@
const tracked_objects::Location& from_here,
base::TimeTicks now,
base::TimeTicks unthrottled_runtime) {
- if (virtual_time_)
- return;
-
base::TimeTicks throttled_runtime =
ThrottledRunTime(std::max(now, unthrottled_runtime));
// If there is a pending call to PumpThrottledTasks and it's sooner than
@@ -189,31 +178,14 @@
pending_pump_throttled_tasks_runtime_ = throttled_runtime;
- pump_throttled_tasks_closure_.Cancel();
+ suspend_timers_when_backgrounded_closure_.Cancel();
base::TimeDelta delay = pending_pump_throttled_tasks_runtime_ - now;
TRACE_EVENT1(tracing_category_,
"ThrottlingHelper::MaybeSchedulePumpThrottledTasksLocked",
"delay_till_next_pump_ms", delay.InMilliseconds());
task_runner_->PostDelayedTask(
- from_here, pump_throttled_tasks_closure_.callback(), delay);
-}
-
-void ThrottlingHelper::EnableVirtualTime() {
- virtual_time_ = true;
-
- pump_throttled_tasks_closure_.Cancel();
-
- while (!throttled_queues_.empty()) {
- TaskQueue* task_queue = throttled_queues_.begin()->first;
- bool enabled = throttled_queues_.begin()->second.enabled;
-
- throttled_queues_.erase(throttled_queues_.begin());
-
- task_queue->SetTimeDomain(renderer_scheduler_->GetVirtualTimeDomain());
- task_queue->SetPumpPolicy(TaskQueue::PumpPolicy::AUTO);
- task_queue->SetQueueEnabled(enabled);
- }
+ from_here, suspend_timers_when_backgrounded_closure_.callback(), delay);
}
} // namespace scheduler
« no previous file with comments | « components/scheduler/renderer/throttling_helper.h ('k') | components/scheduler/renderer/throttling_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698