third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp - Issue 1895303007: Non passive touch end or touch cancel listeners should not block scroll.

Unified Diff: third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

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 | « third_party/WebKit/Source/web/WebPluginContainerImpl.cpp ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

diff --git a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

index 30d90e7718b305224809eee488e6f95caaba21c9..00047a3b152aa9bcc2e623a5c84a2396125321f5 100644

--- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

+++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

@@ -128,7 +128,7 @@ TEST_F(ScrollingCoordinatorTest, fastScrollingByDefault)

WebLayer* rootScrollLayer = getRootScrollLayer();

ASSERT_TRUE(rootScrollLayer->scrollable());

ASSERT_FALSE(rootScrollLayer->shouldScrollOnMainThread());

- ASSERT_EQ(WebEventListenerProperties::Nothing, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::Touch));

+ ASSERT_EQ(WebEventListenerProperties::Nothing, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::TouchStartOrMove));

ASSERT_EQ(WebEventListenerProperties::Nothing, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::MouseWheel));

}

@@ -294,7 +294,7 @@ TEST_F(ScrollingCoordinatorTest, touchEventHandler)

navigateTo(m_baseURL + "touch-event-handler.html");

forceFullCompositingUpdate();

- ASSERT_EQ(WebEventListenerProperties::Blocking, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::Touch));

+ ASSERT_EQ(WebEventListenerProperties::Blocking, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::TouchStartOrMove));

}

TEST_F(ScrollingCoordinatorTest, touchEventHandlerPassive)

@@ -303,7 +303,7 @@ TEST_F(ScrollingCoordinatorTest, touchEventHandlerPassive)

navigateTo(m_baseURL + "touch-event-handler-passive.html");

forceFullCompositingUpdate();

- ASSERT_EQ(WebEventListenerProperties::Passive, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::Touch));

+ ASSERT_EQ(WebEventListenerProperties::Passive, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::TouchStartOrMove));

}

TEST_F(ScrollingCoordinatorTest, touchEventHandlerBoth)

@@ -312,7 +312,7 @@ TEST_F(ScrollingCoordinatorTest, touchEventHandlerBoth)

navigateTo(m_baseURL + "touch-event-handler-both.html");

forceFullCompositingUpdate();

- ASSERT_EQ(WebEventListenerProperties::BlockingAndPassive, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::Touch));

+ ASSERT_EQ(WebEventListenerProperties::BlockingAndPassive, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::TouchStartOrMove));

}

TEST_F(ScrollingCoordinatorTest, wheelEventHandler)

« no previous file with comments | « third_party/WebKit/Source/web/WebPluginContainerImpl.cpp ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »