Changeset 196112 in webkit

Timestamp:

Feb 4, 2016, 12:25:28 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Do not show context menu when right clicking on a scrollbar
​https://bugs.webkit.org/show_bug.cgi?id=153493

Reviewed by Michael Catanzaro.

Source/WebCore:

Scrollbars don't currently handle right clicks, but we are showing
the context menu when they are right clicked. This is not desired
at least in GTK+ and I've checked that it isn't consistent with
other applications in Mac either.

Test: fast/events/contextmenu-on-scrollbars.html

• page/EventHandler.cpp:

(WebCore::EventHandler::sendContextMenuEvent):

LayoutTests:

Add a test to check that context menu event is not sent when right
clicking on a scrollbar.

• fast/events/contextmenu-on-scrollbars-expected.txt: Added.
• fast/events/contextmenu-on-scrollbars.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/contextmenu-on-scrollbars-expected.txt (added)
• LayoutTests/fast/events/contextmenu-on-scrollbars.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Do not show context menu when right clicking on a scrollbar
+        https://bugs.webkit.org/show_bug.cgi?id=153493
+
+        Reviewed by Michael Catanzaro.
+
+        Add a test to check that context menu event is not sent when right
+        clicking on a scrollbar.
+
+        * fast/events/contextmenu-on-scrollbars-expected.txt: Added.
+        * fast/events/contextmenu-on-scrollbars.html: Added.
+
 2016-02-03  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Do not show context menu when right clicking on a scrollbar
+        https://bugs.webkit.org/show_bug.cgi?id=153493
+
+        Reviewed by Michael Catanzaro.
+
+        Scrollbars don't currently handle right clicks, but we are showing
+        the context menu when they are right clicked. This is not desired
+        at least in GTK+ and I've checked that it isn't consistent with
+        other applications in Mac either.
+
+        Test: fast/events/contextmenu-on-scrollbars.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::sendContextMenuEvent):
+
 2016-02-03  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2693 +2693 @@
 {
     Document* doc = m_frame.document();
-    FrameView* v = m_frame.view();
-    if (!v)
-        return false;
-    
+    FrameView* view = m_frame.view();
+    if (!view)
+        return false;
+
     // Clear mouse press state to avoid initiating a drag while context menu is up.
     m_mousePressed = false;
     bool swallowEvent;
-    LayoutPoint viewportPos = v->windowToContents(event.position());
+    LayoutPoint viewportPos = view->windowToContents(event.position());
     HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
     MouseEventWithHitTestResults mouseEvent = doc->prepareMouseEvent(request, viewportPos, event);
 
+    // Do not show context menus when clicking on scrollbars.
+    if (mouseEvent.scrollbar() || view->scrollbarAtPoint(event.position()))
+        return false;
+
     if (m_frame.editor().behavior().shouldSelectOnContextualMenuClick()
         && !m_frame.selection().contains(viewportPos)
-        && !mouseEvent.scrollbar()
         // FIXME: In the editable case, word selection sometimes selects content that isn't underneath the mouse.
         // If the selection is non-editable, we do word selection to make it easier to use the contextual menu items