The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/22ca5b9bce1453364fdb32979af7175ccf234e15

commit 22ca5b9bce1453364fdb32979af7175ccf234e15
Author: alexclarke <alexclarke@chromium.org>
Date: Thu Jun 02 16:14:43 2016

Fix a bug with throttling and timer queue suspension

Both the ThrottlingHelper and timer queue suspension (via
SuspendTimerQueue/ResumeTimerQueue and
SuspendTimerQueueWhenBackgrounded / ResumeTimerQueueWhenForegrounded)
call TaskQueue::SetEnabled and it was possible for the ThrottlingHelper
to re-enable a suspended queue by mistake.

This patch prevents that from happening.

BUG= 616052 

Review-Url: https://codereview.chromium.org/2028433004
Cr-Commit-Position: refs/heads/master@{#397437}

[modify] https://crrev.com/22ca5b9bce1453364fdb32979af7175ccf234e15/components/scheduler/renderer/renderer_scheduler_impl.cc
[modify] https://crrev.com/22ca5b9bce1453364fdb32979af7175ccf234e15/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
[modify] https://crrev.com/22ca5b9bce1453364fdb32979af7175ccf234e15/components/scheduler/renderer/throttling_helper.cc
[modify] https://crrev.com/22ca5b9bce1453364fdb32979af7175ccf234e15/components/scheduler/renderer/throttling_helper.h
[modify] https://crrev.com/22ca5b9bce1453364fdb32979af7175ccf234e15/components/scheduler/renderer/throttling_helper_unittest.cc

Should we backport to M52?

Issue 605267 has been merged into this issue.

Yes we probably should since this is a bug fix. 

Your change meets the bar and is auto-approved for M52 (branch: 2743)

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

 Issue 620857  has been merged into this issue.

Remember to merge to m52

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0dd0191df24c2e430e2c9236fa4c015480285dbe

commit 0dd0191df24c2e430e2c9236fa4c015480285dbe
Author: Alex Clarke <alexclarke@chromium.org>
Date: Mon Jun 20 17:21:40 2016

(Merge m52) Fix a bug with throttling and timer queue suspension

Both the ThrottlingHelper and timer queue suspension (via
SuspendTimerQueue/ResumeTimerQueue and
SuspendTimerQueueWhenBackgrounded / ResumeTimerQueueWhenForegrounded)
call TaskQueue::SetEnabled and it was possible for the ThrottlingHelper
to re-enable a suspended queue by mistake.

This patch prevents that from happening.

BUG= 616052 

Review-Url: https://codereview.chromium.org/2028433004
Cr-Commit-Position: refs/heads/master@{#397437}
(cherry picked from commit 22ca5b9bce1453364fdb32979af7175ccf234e15)

Review URL: https://codereview.chromium.org/2080563003 .

Cr-Commit-Position: refs/branch-heads/2743@{#403}
Cr-Branched-From: 2b3ae3b8090361f8af5a611712fc1a5ab2de53cb-refs/heads/master@{#394939}

[modify] https://crrev.com/0dd0191df24c2e430e2c9236fa4c015480285dbe/components/scheduler/renderer/renderer_scheduler_impl.cc
[modify] https://crrev.com/0dd0191df24c2e430e2c9236fa4c015480285dbe/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
[modify] https://crrev.com/0dd0191df24c2e430e2c9236fa4c015480285dbe/components/scheduler/renderer/throttling_helper.cc
[modify] https://crrev.com/0dd0191df24c2e430e2c9236fa4c015480285dbe/components/scheduler/renderer/throttling_helper.h
[modify] https://crrev.com/0dd0191df24c2e430e2c9236fa4c015480285dbe/components/scheduler/renderer/throttling_helper_unittest.cc