| Index: content/browser/renderer_host/input/non_blocking_event_browsertest.cc
|
| diff --git a/content/browser/renderer_host/input/non_blocking_event_browsertest.cc b/content/browser/renderer_host/input/non_blocking_event_browsertest.cc
|
| index 1c3bd749fa9f21cb99a52b9e78a6998e85ca1876..b80c5672ddbcc334a7dc9612d29d02158e152a65 100644
|
| --- a/content/browser/renderer_host/input/non_blocking_event_browsertest.cc
|
| +++ b/content/browser/renderer_host/input/non_blocking_event_browsertest.cc
|
| @@ -57,6 +57,24 @@ const char kNonBlockingEventDataURL[] =
|
| " document.title='ready';"
|
| "</script>";
|
|
|
| +const char kPassiveTouchStartBlockingTouchEndDataURL[] =
|
| + "data:text/html;charset=utf-8,"
|
| + "<!DOCTYPE html>"
|
| + "<meta name='viewport' content='width=device-width'/>"
|
| + "<style>"
|
| + "html, body {"
|
| + " margin: 0;"
|
| + "}"
|
| + ".spacer { height: 10000px; }"
|
| + "</style>"
|
| + "<div class=spacer></div>"
|
| + "<script>"
|
| + " document.addEventListener('touchstart', function(e) { while(true) {} }, "
|
| + "{'passive': true});"
|
| + " document.addEventListener('touchend', function(e) { while(true) {} });"
|
| + " document.title='ready';"
|
| + "</script>";
|
| +
|
| } // namespace
|
|
|
| namespace content {
|
| @@ -76,8 +94,8 @@ class NonBlockingEventBrowserTest : public ContentBrowserTest {
|
| }
|
|
|
| protected:
|
| - void LoadURL() {
|
| - const GURL data_url(kNonBlockingEventDataURL);
|
| + void LoadURL(const char* page_data) {
|
| + const GURL data_url(page_data);
|
| NavigateToURL(shell(), data_url);
|
|
|
| RenderWidgetHostImpl* host = GetWidgetHost();
|
| @@ -168,7 +186,7 @@ class NonBlockingEventBrowserTest : public ContentBrowserTest {
|
| };
|
|
|
| IN_PROC_BROWSER_TEST_F(NonBlockingEventBrowserTest, MouseWheel) {
|
| - LoadURL();
|
| + LoadURL(kNonBlockingEventDataURL);
|
| DoWheelScroll();
|
| }
|
|
|
| @@ -179,7 +197,21 @@ IN_PROC_BROWSER_TEST_F(NonBlockingEventBrowserTest, MouseWheel) {
|
| #define MAYBE_TouchStart TouchStart
|
| #endif
|
| IN_PROC_BROWSER_TEST_F(NonBlockingEventBrowserTest, MAYBE_TouchStart) {
|
| - LoadURL();
|
| + LoadURL(kNonBlockingEventDataURL);
|
| + DoTouchScroll();
|
| +}
|
| +
|
| +// Disabled on MacOS because it doesn't support touch input.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_PassiveTouchStartBlockingTouchEnd \
|
| + DISABLED_PassiveTouchStartBlockingTouchEnd
|
| +#else
|
| +#define MAYBE_PassiveTouchStartBlockingTouchEnd \
|
| + PassiveTouchStartBlockingTouchEnd
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(NonBlockingEventBrowserTest,
|
| + MAYBE_PassiveTouchStartBlockingTouchEnd) {
|
| + LoadURL(kPassiveTouchStartBlockingTouchEndDataURL);
|
| DoTouchScroll();
|
| }
|
|
|
|
|
Chromium Code Reviews
Issue 1884863003:
Non passive touch end or touch cancel listeners should not block scroll. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master