| Index: third_party/WebKit/Source/core/exported/WebFrameTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/exported/WebFrameTest.cpp b/third_party/WebKit/Source/core/exported/WebFrameTest.cpp
|
| index aaac743e3abdecd8e266f68b41969cf02cd84903..1a47123e82205c00bea00850bb06bac263eb45fc 100644
|
| --- a/third_party/WebKit/Source/core/exported/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/core/exported/WebFrameTest.cpp
|
| @@ -11573,76 +11573,6 @@ TEST_P(ParameterizedWebFrameTest, MouseReleaseUpdatesScrollbarHoveredPart) {
|
| EXPECT_EQ(scrollbar->HoveredPart(), ScrollbarPart::kNoPart);
|
| }
|
|
|
| -class TapChangeHoverStateTest : public ParameterizedWebFrameTest {
|
| - public:
|
| - void RunTest(bool viewport_enabled,
|
| - bool viewport_meta,
|
| - bool should_change_hover_state) {
|
| - std::string test_page =
|
| - viewport_meta ? "viewport-2-div.html" : "noviewport-2-div.html";
|
| -
|
| - FakeCompositingWebViewClient client;
|
| - RegisterMockedHttpURLLoad(test_page);
|
| - FrameTestHelpers::WebViewHelper web_view_helper;
|
| - WebViewBase* web_view;
|
| - if (viewport_enabled) {
|
| - web_view = web_view_helper.InitializeAndLoad(
|
| - base_url_ + test_page, nullptr, &client, nullptr, ConfigureAndroid);
|
| - } else {
|
| - web_view = web_view_helper.InitializeAndLoad(base_url_ + test_page);
|
| - }
|
| - web_view_helper.Resize(WebSize(250, 250));
|
| -
|
| - Document* document =
|
| - ToLocalFrame(web_view->GetPage()->MainFrame())->GetDocument();
|
| -
|
| - Element* div1 = document->getElementById("div1");
|
| - Element* div2 = document->getElementById("div2");
|
| -
|
| - // Move mouse over div1 should hover div1.
|
| - WebMouseEvent mouse_move_over_div1(
|
| - WebInputEvent::kMouseMove, WebFloatPoint(10, 10), WebFloatPoint(10, 10),
|
| - WebPointerProperties::Button::kNoButton, 0, WebInputEvent::kNoModifiers,
|
| - TimeTicks::Now().InSeconds());
|
| - mouse_move_over_div1.SetFrameScale(1);
|
| - document->GetFrame()->GetEventHandler().HandleMouseMoveEvent(
|
| - mouse_move_over_div1, Vector<WebMouseEvent>());
|
| -
|
| - DCHECK(document->HoverElement() == div1);
|
| -
|
| - // Tap on div2.
|
| - WebGestureEvent tap_on_div2(WebInputEvent::kGestureTap,
|
| - WebInputEvent::kNoModifiers,
|
| - WebInputEvent::kTimeStampForTesting);
|
| - tap_on_div2.SetFrameScale(1);
|
| - tap_on_div2.x = tap_on_div2.global_x = 10;
|
| - tap_on_div2.y = tap_on_div2.global_y = 110;
|
| - tap_on_div2.source_device = kWebGestureDeviceTouchscreen;
|
| - web_view_helper.WebView()
|
| - ->MainFrameImpl()
|
| - ->GetFrame()
|
| - ->GetEventHandler()
|
| - .HandleGestureEvent(tap_on_div2);
|
| -
|
| - Element* expected_hover_element = should_change_hover_state ? div2 : div1;
|
| - EXPECT_EQ(expected_hover_element, document->HoverElement());
|
| - }
|
| -};
|
| -
|
| -INSTANTIATE_TEST_CASE_P(All, TapChangeHoverStateTest, ::testing::Bool());
|
| -
|
| -TEST_P(TapChangeHoverStateTest, TapNotChangeHoverStateOnViewportMetaAndMobile) {
|
| - RunTest(true, true, false);
|
| -}
|
| -
|
| -TEST_P(TapChangeHoverStateTest, TapChangeHoverStateOnNoViewportMetaAndMobile) {
|
| - RunTest(true, false, true);
|
| -}
|
| -
|
| -TEST_P(TapChangeHoverStateTest, TapChangeHoverStateOnViewportMetaAndDesktop) {
|
| - RunTest(false, true, true);
|
| -}
|
| -
|
| TEST_P(ParameterizedWebFrameTest,
|
| CustomScrollbarInOverlayScrollbarThemeWillNotCauseDCHECKFails) {
|
| RegisterMockedHttpURLLoad(
|
|
|