Title: [196928] releases/WebKitGTK/webkit-2.10/Source/WebCore
- Revision
- 196928
- Author
- [email protected]
- Date
- 2016-02-22 02:35:18 -0800 (Mon, 22 Feb 2016)
Log Message
Merge r196631 - Mouse cursor doesn't change when entering scrollbars
https://bugs.webkit.org/show_bug.cgi?id=154243
Reviewed by Simon Fraser.
If the scrollbar is over or very close to text or a link, when
entering the scrollbar the cursor is not changed, keeping the beam
or hand cursor when using the scrollbar. Same happens for image
documents where the magnifier cursor is used and it remains when
entering the scrollbars. We should use pointer cursor always for
scrollbars.
* page/EventHandler.cpp:
(WebCore::EventHandler::updateCursor): Request also to include
frame scrollbars in hit test result.
(WebCore::EventHandler::selectCursor): Use always pointer cursor
for scrollbars.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (196927 => 196928)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-02-22 10:32:35 UTC (rev 196927)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-02-22 10:35:18 UTC (rev 196928)
@@ -1,3 +1,23 @@
+2016-02-16 Carlos Garcia Campos <[email protected]>
+
+ Mouse cursor doesn't change when entering scrollbars
+ https://bugs.webkit.org/show_bug.cgi?id=154243
+
+ Reviewed by Simon Fraser.
+
+ If the scrollbar is over or very close to text or a link, when
+ entering the scrollbar the cursor is not changed, keeping the beam
+ or hand cursor when using the scrollbar. Same happens for image
+ documents where the magnifier cursor is used and it remains when
+ entering the scrollbars. We should use pointer cursor always for
+ scrollbars.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::updateCursor): Request also to include
+ frame scrollbars in hit test result.
+ (WebCore::EventHandler::selectCursor): Use always pointer cursor
+ for scrollbars.
+
2016-02-15 Jer Noble <[email protected]>
Null-deref crash in DefaultAudioDestinationNode::suspend()
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/EventHandler.cpp (196927 => 196928)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/EventHandler.cpp 2016-02-22 10:32:35 UTC (rev 196927)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/EventHandler.cpp 2016-02-22 10:35:18 UTC (rev 196928)
@@ -1389,7 +1389,7 @@
bool metaKey;
PlatformKeyboardEvent::getCurrentModifierState(shiftKey, ctrlKey, altKey, metaKey);
- HitTestRequest request(HitTestRequest::ReadOnly);
+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::AllowFrameScrollbars);
HitTestResult result(view->windowToContents(m_lastKnownMousePosition));
renderView->hitTest(request, result);
@@ -1413,6 +1413,14 @@
return NoCursorChange;
#endif
+ // Use always pointer cursor for scrollbars.
+ if (result.scrollbar()) {
+#if ENABLE(CURSOR_VISIBILITY)
+ cancelAutoHideCursorTimer();
+#endif
+ return pointerCursor();
+ }
+
Node* node = result.targetNode();
if (!node)
return NoCursorChange;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes