diff options
| author | ki.stfu <ki.stfu@gmail.com> | 2015-11-09 12:54:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-09 20:55:56 +0000 |
| commit | a81d2c7040f20ae45f5ff467aa91361ab5fef47a (patch) | |
| tree | 5d587191dfc3c0a67e9428e46c4660ad67861fe4 | |
| parent | f0a9a5fc4ea96cfb834beb691bdeabdf3aa31e24 (diff) | |
| download | chromium_src-a81d2c7040f20ae45f5ff467aa91361ab5fef47a.zip chromium_src-a81d2c7040f20ae45f5ff467aa91361ab5fef47a.tar.gz chromium_src-a81d2c7040f20ae45f5ff467aa91361ab5fef47a.tar.bz2 | |
Fix DCHECK failure when scrolling by touch+mouse in LayerTreeHostImpl::ScrollBegin
BUG=341928
R=majidvp@chromium.org,enne@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1407033002
Cr-Commit-Position: refs/heads/master@{#358647}
| -rw-r--r-- | cc/trees/layer_tree_host_impl.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index bb63c28..6834c22 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -2487,7 +2487,6 @@ InputHandler::ScrollStatus LayerTreeHostImpl::RootScrollBegin( InputHandler::ScrollInputType type) { TRACE_EVENT0("cc", "LayerTreeHostImpl::RootScrollBegin"); - DCHECK(!CurrentlyScrollingLayer()); ClearCurrentlyScrollingLayer(); return ScrollBeginImpl(InnerViewportScrollLayer(), type); @@ -2498,7 +2497,6 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin( InputHandler::ScrollInputType type) { TRACE_EVENT0("cc", "LayerTreeHostImpl::ScrollBegin"); - DCHECK(!CurrentlyScrollingLayer()); ClearCurrentlyScrollingLayer(); gfx::PointF device_viewport_point = gfx::ScalePoint( |