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

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 1577263004: Communicate whether passive event listeners exist to cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_wheel_passive_listeners
Patch Set: Rebase Created 4 years, 11 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
Index: cc/trees/layer_tree_host_common_unittest.cc
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index f4e5b600d39424f24c1bf3ecec9224fd8942f52d..4feca0508ace373b2a6d4251a9a0a5565d5f95b2 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -9039,11 +9039,20 @@ TEST_F(LayerTreeHostCommonTest, InputHandlersRecursiveUpdateTest) {
EXPECT_EQ(root->layer_or_descendant_has_input_handler(), false);
- child->SetHaveWheelEventHandlers(true);
+ child->SetWheelEventProperties(EventListenerProperties::kBlocking);
ExecuteCalculateDrawProperties(root);
EXPECT_EQ(root->layer_or_descendant_has_input_handler(), true);
- child->SetHaveWheelEventHandlers(false);
+ child->SetWheelEventProperties(EventListenerProperties::kPassive);
+ ExecuteCalculateDrawProperties(root);
+ EXPECT_EQ(root->layer_or_descendant_has_input_handler(), true);
+
+ child->SetWheelEventProperties(EventListenerProperties::kBlocking |
+ EventListenerProperties::kPassive);
+ ExecuteCalculateDrawProperties(root);
+ EXPECT_EQ(root->layer_or_descendant_has_input_handler(), true);
+
+ child->SetWheelEventProperties(EventListenerProperties::kNone);
ExecuteCalculateDrawProperties(root);
EXPECT_EQ(root->layer_or_descendant_has_input_handler(), false);
}
@@ -9539,7 +9548,7 @@ TEST_F(LayerTreeHostCommonTest, LayerWithInputHandlerAndZeroOpacity) {
render_surface->SetMasksToBounds(true);
test_layer->SetDrawsContent(true);
test_layer->SetOpacity(0);
- test_layer->SetHaveWheelEventHandlers(true);
+ test_layer->SetWheelEventProperties(EventListenerProperties::kBlocking);
ExecuteCalculateDrawProperties(root);
EXPECT_EQ(gfx::Rect(20, 20), test_layer->drawable_content_rect());

Powered by Google App Engine
This is Rietveld 408576698