| Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| index ba56e4afa4be5448c5fb194f62998595839f11d2..c1b57e52ca6d1ee699bd0349ce43531b595dda09 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -10803,7 +10803,7 @@ TEST_F(WebFrameTest, MouseOverDifferntNodeClearsTooltip) {
|
| document->frame()->eventHandler().handleMouseMoveEvent(
|
| mouseMoveOverLinkEvent, Vector<WebMouseEvent>());
|
|
|
| - EXPECT_EQ(document->hoverNode(),
|
| + EXPECT_EQ(document->hoverElement(),
|
| document->frame()->chromeClient().lastSetTooltipNodeForTesting());
|
| EXPECT_EQ(div1Tag,
|
| document->frame()->chromeClient().lastSetTooltipNodeForTesting());
|
| @@ -10820,7 +10820,7 @@ TEST_F(WebFrameTest, MouseOverDifferntNodeClearsTooltip) {
|
| document->frame()->eventHandler().handleMouseMoveEvent(
|
| mouseMoveEvent, Vector<WebMouseEvent>());
|
|
|
| - EXPECT_EQ(document->hoverNode(),
|
| + EXPECT_EQ(document->hoverElement(),
|
| document->frame()->chromeClient().lastSetTooltipNodeForTesting());
|
| EXPECT_EQ(div2Tag,
|
| document->frame()->chromeClient().lastSetTooltipNodeForTesting());
|
| @@ -10898,7 +10898,7 @@ TEST_F(WebFrameTest, MouseOverLinkAndOverlayScrollbar) {
|
| document->frame()->eventHandler().handleMousePressEvent(mousePressEvent);
|
|
|
| EXPECT_FALSE(document->activeHoverElement());
|
| - EXPECT_FALSE(document->hoverNode());
|
| + EXPECT_FALSE(document->hoverElement());
|
|
|
| WebMouseEvent mouseReleaseEvent(
|
| WebInputEvent::MouseUp, WebFloatPoint(18, aTag->offsetTop()),
|
| @@ -10929,7 +10929,7 @@ TEST_F(WebFrameTest, MouseOverLinkAndOverlayScrollbar) {
|
| document->frame()->eventHandler().handleMousePressEvent(mousePressEvent);
|
|
|
| EXPECT_TRUE(document->activeHoverElement());
|
| - EXPECT_TRUE(document->hoverNode());
|
| + EXPECT_TRUE(document->hoverElement());
|
|
|
| document->frame()->eventHandler().handleMouseReleaseEvent(mouseReleaseEvent);
|
| }
|
| @@ -10967,7 +10967,7 @@ TEST_F(WebFrameTest, MouseOverCustomScrollbar) {
|
| mouseMoveOverDiv, Vector<WebMouseEvent>());
|
|
|
| // DIV :hover
|
| - EXPECT_EQ(document->hoverNode(), scrollbarDiv);
|
| + EXPECT_EQ(document->hoverElement(), scrollbarDiv);
|
|
|
| // Ensure hittest has DIV and scrollbar
|
| hitTestResult = webView->coreHitTestResultAt(WebPoint(175, 1));
|
| @@ -10986,7 +10986,7 @@ TEST_F(WebFrameTest, MouseOverCustomScrollbar) {
|
| mouseMoveOverDivAndScrollbar, Vector<WebMouseEvent>());
|
|
|
| // Custom not change the DIV :hover
|
| - EXPECT_EQ(document->hoverNode(), scrollbarDiv);
|
| + EXPECT_EQ(document->hoverElement(), scrollbarDiv);
|
| EXPECT_EQ(hitTestResult.scrollbar()->hoveredPart(), ScrollbarPart::ThumbPart);
|
| }
|
|
|
| @@ -11033,7 +11033,7 @@ TEST_F(WebFrameTest, MouseOverScrollbarAndParentElement) {
|
| mouseMoveOverDiv, Vector<WebMouseEvent>());
|
|
|
| // DIV :hover.
|
| - EXPECT_EQ(document->hoverNode(), parentDiv);
|
| + EXPECT_EQ(document->hoverElement(), parentDiv);
|
|
|
| // Ensure hittest has DIV and scrollbar.
|
| hitTestResult = webView->coreHitTestResultAt(WebPoint(175, 5));
|
| @@ -11053,7 +11053,7 @@ TEST_F(WebFrameTest, MouseOverScrollbarAndParentElement) {
|
| mouseMoveOverDivAndScrollbar, Vector<WebMouseEvent>());
|
|
|
| // Not change the DIV :hover.
|
| - EXPECT_EQ(document->hoverNode(), parentDiv);
|
| + EXPECT_EQ(document->hoverElement(), parentDiv);
|
|
|
| // Disable the Scrollbar by remove the childDiv.
|
| childDiv->remove();
|
| @@ -11072,7 +11072,7 @@ TEST_F(WebFrameTest, MouseOverScrollbarAndParentElement) {
|
| mouseMoveOverDivAndScrollbar, Vector<WebMouseEvent>());
|
|
|
| // Not change the DIV :hover.
|
| - EXPECT_EQ(document->hoverNode(), parentDiv);
|
| + EXPECT_EQ(document->hoverElement(), parentDiv);
|
| }
|
|
|
| TEST_F(WebFrameTest, MouseReleaseUpdatesScrollbarHoveredPart) {
|
|
|