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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 1895303007: Non passive touch end or touch cancel listeners should not block scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 8 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
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 89f658087f126f40b0be44eef98c6e97559fb8b9..a31ec95ffbf6f900b162f8e3503ad913b465a260 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1495,7 +1495,11 @@ class LayerTreeHostTestCommit : public LayerTreeHostTest {
layer_tree_host()->SetEventListenerProperties(
EventListenerClass::kMouseWheel, EventListenerProperties::kPassive);
layer_tree_host()->SetEventListenerProperties(
- EventListenerClass::kTouch, EventListenerProperties::kBlocking);
+ EventListenerClass::kTouchStartOrMove,
+ EventListenerProperties::kBlocking);
+ layer_tree_host()->SetEventListenerProperties(
+ EventListenerClass::kTouchEndOrCancel,
+ EventListenerProperties::kBlockingAndPassive);
layer_tree_host()->SetHaveScrollEventHandlers(true);
PostSetNeedsCommitToMainThread();
@@ -1509,7 +1513,10 @@ class LayerTreeHostTestCommit : public LayerTreeHostTest {
EventListenerClass::kMouseWheel));
EXPECT_EQ(EventListenerProperties::kBlocking,
impl->active_tree()->event_listener_properties(
- EventListenerClass::kTouch));
+ EventListenerClass::kTouchStartOrMove));
+ EXPECT_EQ(EventListenerProperties::kBlockingAndPassive,
+ impl->active_tree()->event_listener_properties(
+ EventListenerClass::kTouchEndOrCancel));
EXPECT_TRUE(impl->active_tree()->have_scroll_event_handlers());
EndTest();
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698