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

Unified Diff: cc/test/layer_tree_json_parser_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: Fix Android/ChromeOS build problems with bit packed enum class 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/test/layer_tree_json_parser_unittest.cc
diff --git a/cc/test/layer_tree_json_parser_unittest.cc b/cc/test/layer_tree_json_parser_unittest.cc
index f1110329edd9c063800cddfc0e6da67c56795000..a3a7b44e888328964bde5e074430dc79772398c0 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -41,8 +41,10 @@ bool LayerTreesMatch(LayerImpl* const layer_impl,
layer->scrollable()));
RETURN_IF_EXPECTATION_FAILS(EXPECT_FLOAT_EQ(layer_impl->opacity(),
layer->opacity()));
- RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->have_wheel_event_handlers(),
- layer->have_wheel_event_handlers()));
+ RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->touch_event_properties(),
+ layer->touch_event_properties()));
+ RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->wheel_event_properties(),
+ layer->wheel_event_properties()));
RETURN_IF_EXPECTATION_FAILS(
EXPECT_EQ(layer_impl->have_scroll_event_handlers(),
layer->have_scroll_event_handlers()));
@@ -82,7 +84,10 @@ TEST_F(LayerTreeJsonParserSanityCheck, Basic) {
parent->SetPosition(gfx::PointF(25.f, 25.f));
- child->SetHaveWheelEventHandlers(true);
+ child->SetWheelEventProperties(EventListenerProperties::BLOCKING |
+ EventListenerProperties::PASSIVE);
+ child->SetTouchEventProperties(EventListenerProperties::BLOCKING |
+ EventListenerProperties::PASSIVE);
child->SetHaveScrollEventHandlers(true);
parent->AddChild(std::move(child));

Powered by Google App Engine
This is Rietveld 408576698