| Index: content/browser/site_per_process_browsertest.cc
|
| diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
|
| index dadfadfe816da806aff45e8844aa067de69afaae..d7fad7deed9a3c597c2fc3f183df719164118e92 100644
|
| --- a/content/browser/site_per_process_browsertest.cc
|
| +++ b/content/browser/site_per_process_browsertest.cc
|
| @@ -994,7 +994,15 @@ class FrameRectChangedMessageFilter : public content::BrowserMessageFilter {
|
| // Test that the view bounds for an out-of-process iframe are set and updated
|
| // correctly, including accounting for local frame offsets in the parent and
|
| // scroll positions.
|
| -IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, ViewBoundsInNestedFrameTest) {
|
| +#if defined(OS_ANDROID)
|
| +// Test failing on some Android builders, due to inaccurate coordinates on
|
| +// some devices. See: https://crbug.com/700007.
|
| +#define MAYBE_ViewBoundsInNestedFrameTest DISABLED_ViewBoundsInNestedFrameTest
|
| +#else
|
| +#define MAYBE_ViewBoundsInNestedFrameTest ViewBoundsInNestedFrameTest
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| + MAYBE_ViewBoundsInNestedFrameTest) {
|
| GURL main_url(embedded_test_server()->GetURL(
|
| "a.com", "/cross_site_iframe_factory.html?a(a)"));
|
| EXPECT_TRUE(NavigateToURL(shell(), main_url));
|
| @@ -1302,9 +1310,11 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, MAYBE_ScrollEventToOOPIF) {
|
|
|
| // Test that mouse events are being routed to the correct RenderWidgetHostView
|
| // based on coordinates.
|
| -#if defined(THREAD_SANITIZER)
|
| +#if defined(THREAD_SANITIZER) || defined(OS_ANDROID)
|
| // The test times out often on TSAN bot.
|
| // https://crbug.com/591170.
|
| +// Test failing on some Android builders, due to inaccurate coordinates on
|
| +// some devices. See: https://crbug.com/700007.
|
| #define MAYBE_SurfaceHitTestTest DISABLED_SurfaceHitTestTest
|
| #else
|
| #define MAYBE_SurfaceHitTestTest SurfaceHitTestTest
|
| @@ -1329,7 +1339,15 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessHighDPIBrowserTest,
|
|
|
| // Test that mouse events are being routed to the correct RenderWidgetHostView
|
| // when there are nested out-of-process iframes.
|
| -IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NestedSurfaceHitTestTest) {
|
| +#if defined(OS_ANDROID)
|
| +// Test failing on some Android builders, due to inaccurate coordinates on
|
| +// some devices. See: https://crbug.com/700007.
|
| +#define MAYBE_NestedSurfaceHitTestTest DISABLED_NestedSurfaceHitTestTest
|
| +#else
|
| +#define MAYBE_NestedSurfaceHitTestTest NestedSurfaceHitTestTest
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| + MAYBE_NestedSurfaceHitTestTest) {
|
| GURL main_url(embedded_test_server()->GetURL(
|
| "/frame_tree/page_with_positioned_nested_frames.html"));
|
| EXPECT_TRUE(NavigateToURL(shell(), main_url));
|
| @@ -1468,8 +1486,17 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
|
|
| // This test verifies that MouseEnter and MouseLeave events fire correctly
|
| // when the mouse cursor moves between processes.
|
| +#if defined(OS_ANDROID)
|
| +// Test failing on some Android builders, due to inaccurate coordinates on
|
| +// some devices. See: https://crbug.com/700007.
|
| +#define MAYBE_CrossProcessMouseEnterAndLeaveTest \
|
| + DISABLED_CrossProcessMouseEnterAndLeaveTest
|
| +#else
|
| +#define MAYBE_CrossProcessMouseEnterAndLeaveTest \
|
| + CrossProcessMouseEnterAndLeaveTest
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| - CrossProcessMouseEnterAndLeaveTest) {
|
| + MAYBE_CrossProcessMouseEnterAndLeaveTest) {
|
| GURL main_url(embedded_test_server()->GetURL(
|
| "a.com", "/cross_site_iframe_factory.html?a(b,c(d))"));
|
| EXPECT_TRUE(NavigateToURL(shell(), main_url));
|
| @@ -1588,7 +1615,15 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| // Verify that mouse capture works on a RenderWidgetHostView level, so that
|
| // dragging scroll bars and selecting text continues even when the mouse
|
| // cursor crosses over cross-process frame boundaries.
|
| -IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossProcessMouseCapture) {
|
| +#if defined(OS_ANDROID)
|
| +// Test failing on some Android builders, due to inaccurate coordinates on
|
| +// some devices. See: https://crbug.com/700007.
|
| +#define MAYBE_CrossProcessMouseCapture DISABLED_CrossProcessMouseCapture
|
| +#else
|
| +#define MAYBE_CrossProcessMouseCapture CrossProcessMouseCapture
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| + MAYBE_CrossProcessMouseCapture) {
|
| GURL main_url(embedded_test_server()->GetURL(
|
| "/frame_tree/page_with_positioned_frame.html"));
|
| EXPECT_TRUE(NavigateToURL(shell(), main_url));
|
|
|