commit 28e0a3c183499e50b1b89231d4ed40bafb8883fe
author ccameron chromium <ccameron@chromium.org> Fri Aug 11 04:59:46 2017
committer Commit Bot <commit-bot@chromium.org> Fri Aug 11 04:59:46 2017
tree 3bb982ce50a961a0ad6121de1f803742e4702f72
parent 7c390ab5446b25250fa3a6dd67b9774adc757c5d

Revert "Ensure overlapping compositor locks can time out"

This reverts commit aaf6b58123e9bc49391a8f8cfe057b7c3269e9ef.

Reason for revert:
This has been subsumed by r493563

It is required that indefinite locks be held indefinitely,
even if a timeout lock is created in the middle. Not doing
so results in flashes, see crbug.com/752566

Original change's description:
> Ensure overlapping compositor locks can time out
> 
> With the current logic in Compositor::GetCompositorLock(), if a lock is
> being held with no timeout and another lock is being created that has a
> timeout value, the second lock will never time out. The lock can be
> held indefinitely if the caller was relying on the timeout.
> 
> This changes the behavior of GetCompositorLock() so that a lock with
> a non-null timeout will override a lock that had a null timeout, causing
> them both to timeout. Potentially this could cause unexpected behavior
> where a lock without a timeout value is still timing out, but this can
> already happen if the locks are taken in the inverse order.
> 
> Bug: 739621
> Change-Id: I32cfbbbc61adf14db263aa413e4019877b041d70
> Reviewed-on: https://chromium-review.googlesource.com/587464
> Reviewed-by: danakj <danakj@chromium.org>
> Reviewed-by: Antoine Labour <piman@chromium.org>
> Commit-Queue: Ken Buchanan <kenrb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#489942}

TBR=danakj@chromium.org,kenrb@chromium.org,piman@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 739621
Change-Id: Iedfa6b518e3f51195a43f4bc1d4d03634ca8b125
Reviewed-on: https://chromium-review.googlesource.com/611800
Reviewed-by: ccameron chromium <ccameron@chromium.org>
Commit-Queue: ccameron chromium <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#493671}