Commit d77c05e9 authored by W. James MacLean's avatar W. James MacLean Committed by Commit Bot

Tentatively re-enable BubbledScrollEventsTransformedCorrectly.

A number of changes have landed recently that may eliminate the
flakieness seen in this test. This CL re-enables the test, but feel
free to revert this if the flakes continue.

Bug: 83380
Change-Id: I0fb587a394bcaaae54a8bdc85ec6861a775f3d31
Reviewed-on: https://chromium-review.googlesource.com/1196767Reviewed-by: default avatarKen Buchanan <kenrb@chromium.org>
Commit-Queue: James MacLean <wjmaclean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587628}
parent 718212bc
...@@ -1166,14 +1166,6 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, ...@@ -1166,14 +1166,6 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
scroll_end_observer.Wait(); scroll_end_observer.Wait();
} }
#if defined(OS_LINUX)
// The test is flaky on Linux: https://crbug.com/833380.
#define MAYBE_BubbledScrollEventsTransformedCorrectly \
DISABLED_BubbledScrollEventsTransformedCorrectly
#else
#define MAYBE_BubbledScrollEventsTransformedCorrectly \
BubbledScrollEventsTransformedCorrectly
#endif
// When a scroll event is bubbled, ensure that the bubbled event's coordinates // When a scroll event is bubbled, ensure that the bubbled event's coordinates
// are correctly updated to the ancestor's coordinate space. In particular, // are correctly updated to the ancestor's coordinate space. In particular,
// ensure that the transformation considers CSS scaling of the child where // ensure that the transformation considers CSS scaling of the child where
...@@ -1181,7 +1173,7 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, ...@@ -1181,7 +1173,7 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
// coordinates in the ancestor's coordinate space. // coordinates in the ancestor's coordinate space.
// See https://crbug.com/817392 // See https://crbug.com/817392
IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
MAYBE_BubbledScrollEventsTransformedCorrectly) { BubbledScrollEventsTransformedCorrectly) {
GURL main_url(embedded_test_server()->GetURL( GURL main_url(embedded_test_server()->GetURL(
"/frame_tree/page_with_positioned_scaled_frame.html")); "/frame_tree/page_with_positioned_scaled_frame.html"));
ASSERT_TRUE(NavigateToURL(shell(), main_url)); ASSERT_TRUE(NavigateToURL(shell(), main_url));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment