Commit 0793f8f7 authored by Peter Boström's avatar Peter Boström Committed by Commit Bot

Disable TouchpadPinchOverOOPIF tests on Windows

SitePerProcessHitTestBrowserTest.TouchpadPinchOverOOPIF is being
reported as flaky on Windows.

Bug: chromium:868308, chromium:833380
TBR: kenrb@chromium.org
Change-Id: I83142d0d777bbe51773eaba0ab1d191a4af0cbc5
Reviewed-on: https://chromium-review.googlesource.com/1155165Reviewed-by: default avatarKevin McNee <mcnee@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579096}
parent 751f9c67
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "base/gtest_prod_util.h" #include "base/gtest_prod_util.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "build/build_config.h"
#include "components/viz/common/surfaces/surface_id.h" #include "components/viz/common/surfaces/surface_id.h"
#include "components/viz/host/hit_test/hit_test_query.h" #include "components/viz/host/hit_test/hit_test_query.h"
#include "components/viz/service/surfaces/surface_hittest_delegate.h" #include "components/viz/service/surfaces/surface_hittest_delegate.h"
...@@ -26,6 +27,13 @@ ...@@ -26,6 +27,13 @@
struct FrameHostMsg_HittestData_Params; struct FrameHostMsg_HittestData_Params;
#if defined(OS_WIN)
// Flaky on Windows. https://crbug.com/868308
#define MAYBE_TouchpadPinchOverOOPIF DISABLED_TouchpadPinchOverOOPIF
#else
#define MAYBE_TouchpadPinchOverOOPIF TouchpadPinchOverOOPIF
#endif // OS_WIN
namespace blink { namespace blink {
class WebGestureEvent; class WebGestureEvent;
class WebInputEvent; class WebInputEvent;
...@@ -331,7 +339,7 @@ class CONTENT_EXPORT RenderWidgetHostInputEventRouter ...@@ -331,7 +339,7 @@ class CONTENT_EXPORT RenderWidgetHostInputEventRouter
FRIEND_TEST_ALL_PREFIXES(SitePerProcessHitTestBrowserTest, FRIEND_TEST_ALL_PREFIXES(SitePerProcessHitTestBrowserTest,
InputEventRouterTouchpadGestureTargetTest); InputEventRouterTouchpadGestureTargetTest);
FRIEND_TEST_ALL_PREFIXES(SitePerProcessHitTestBrowserTest, FRIEND_TEST_ALL_PREFIXES(SitePerProcessHitTestBrowserTest,
TouchpadPinchOverOOPIF); MAYBE_TouchpadPinchOverOOPIF);
FRIEND_TEST_ALL_PREFIXES(SitePerProcessMouseWheelHitTestBrowserTest, FRIEND_TEST_ALL_PREFIXES(SitePerProcessMouseWheelHitTestBrowserTest,
InputEventRouterWheelTargetTest); InputEventRouterWheelTargetTest);
FRIEND_TEST_ALL_PREFIXES(SitePerProcessMacBrowserTest, FRIEND_TEST_ALL_PREFIXES(SitePerProcessMacBrowserTest,
......
...@@ -3708,7 +3708,7 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, ...@@ -3708,7 +3708,7 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
// wheel events to the child and causes the page scale factor to change for // wheel events to the child and causes the page scale factor to change for
// the main frame (given that the child did not consume the wheel). // the main frame (given that the child did not consume the wheel).
IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
TouchpadPinchOverOOPIF) { MAYBE_TouchpadPinchOverOOPIF) {
GURL main_url(embedded_test_server()->GetURL( GURL main_url(embedded_test_server()->GetURL(
"/frame_tree/page_with_positioned_frame.html")); "/frame_tree/page_with_positioned_frame.html"));
EXPECT_TRUE(NavigateToURL(shell(), main_url)); EXPECT_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