Commit caec43ce authored by chaopeng's avatar chaopeng Committed by Commit Bot

Add kRunningOnCompositorButNeedsAdjustment to DCHECK in WillAnimateToOffset

In some cases, ScrollAnimator::WillAnimateToOffset called with run_state_ ==
RunState::kRunningOnCompositorButNeedsAdjustment.

Bug: 825351
Change-Id: I805625d87d469c77564391c83d381eb179c665c8
Reviewed-on: https://chromium-review.googlesource.com/1033015Reviewed-by: default avatarSteve Kobes <skobes@chromium.org>
Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Commit-Queue: Jianpeng Chao <chaopeng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554790}
parent 23eefd32
...@@ -161,7 +161,8 @@ bool ScrollAnimator::WillAnimateToOffset(const ScrollOffset& target_offset) { ...@@ -161,7 +161,8 @@ bool ScrollAnimator::WillAnimateToOffset(const ScrollOffset& target_offset) {
DCHECK(run_state_ == RunState::kRunningOnMainThread || DCHECK(run_state_ == RunState::kRunningOnMainThread ||
run_state_ == RunState::kRunningOnCompositor || run_state_ == RunState::kRunningOnCompositor ||
run_state_ == RunState::kRunningOnCompositorButNeedsUpdate || run_state_ == RunState::kRunningOnCompositorButNeedsUpdate ||
run_state_ == RunState::kRunningOnCompositorButNeedsTakeover); run_state_ == RunState::kRunningOnCompositorButNeedsTakeover ||
run_state_ == RunState::kRunningOnCompositorButNeedsAdjustment);
// Running on the main thread, simply update the target offset instead // Running on the main thread, simply update the target offset instead
// of sending to the compositor. // of sending to the compositor.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment