<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196112] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196112">196112</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-04 00:25:28 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventscontextmenuonscrollbarsexpectedtxt">trunk/LayoutTests/fast/events/contextmenu-on-scrollbars-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventscontextmenuonscrollbarshtml">trunk/LayoutTests/fast/events/contextmenu-on-scrollbars.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196111 => 196112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-02-04 07:37:52 UTC (rev 196111)
+++ trunk/LayoutTests/ChangeLog        2016-02-04 08:25:28 UTC (rev 196112)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-02-03 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Accepted candidates should not be autocorrected
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventscontextmenuonscrollbarsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/contextmenu-on-scrollbars-expected.txt (0 => 196112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/contextmenu-on-scrollbars-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/events/contextmenu-on-scrollbars-expected.txt        2016-02-04 08:25:28 UTC (rev 196112)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This is a test for https://bugs.webkit.org/show_bug.cgi?id=153493
+
+SUCCESS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventscontextmenuonscrollbarshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/contextmenu-on-scrollbars.html (0 => 196112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/contextmenu-on-scrollbars.html         (rev 0)
+++ trunk/LayoutTests/fast/events/contextmenu-on-scrollbars.html        2016-02-04 08:25:28 UTC (rev 196112)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+
+<style>
+ #scrollme {
+ width: 100px;
+ height: 100px;
+ overflow: auto;
+ }
+ #scrollme p {
+ height: 1000px;
+ }
+</style>
+<body style="min-height: 5000px">
+<p>This is a test for <a href="https://bugs.webkit.org/show_bug.cgi?id=153493">https://bugs.webkit.org/show_bug.cgi?id=153493</a></p>
+<div id="scrollme"><p></p></div>
+<pre id="log"></pre>
+<div style="height: 150%"></div>
+<script>
+ function log(msg)
+ {
+ document.getElementById('log').appendChild(document.createTextNode(msg + "\n"));
+ }
+
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var didSendContextMenu = false;
+
+ document.oncontextmenu = function() { didSendContextMenu = true; }
+
+ if (window.eventSender) {
+ var failed = false;
+
+ eventSender.mouseMoveTo(window.innerWidth - 4, window.innerHeight - 4);
+ eventSender.contextClick();
+ if (didSendContextMenu) {
+ log('FAILED: context menu event received on main frame scrollbar');
+ failed = true;
+ didSendContextMenu = false;
+ }
+
+ var div = document.querySelector('#scrollme');
+ eventSender.mouseMoveTo(div.offsetLeft + div.offsetWidth - 4, div.offsetTop + 1);
+ eventSender.contextClick();
+ if (didSendContextMenu) {
+ log('FAILED: context menu event received on div scrollbar');
+ failed = true;
+ }
+ if (!failed)
+ log('SUCCESS');
+ }
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196111 => 196112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-04 07:37:52 UTC (rev 196111)
+++ trunk/Source/WebCore/ChangeLog        2016-02-04 08:25:28 UTC (rev 196112)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-02-03 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Throw away linked code when navigating to a new page.
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (196111 => 196112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2016-02-04 07:37:52 UTC (rev 196111)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2016-02-04 08:25:28 UTC (rev 196112)
</span><span class="lines">@@ -2692,20 +2692,23 @@
</span><span class="cx"> bool EventHandler::sendContextMenuEvent(const PlatformMouseEvent& event)
</span><span class="cx"> {
</span><span class="cx"> Document* doc = m_frame.document();
</span><del>- FrameView* v = m_frame.view();
- if (!v)
</del><ins>+ FrameView* view = m_frame.view();
+ if (!view)
</ins><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Clear mouse press state to avoid initiating a drag while context menu is up.
</span><span class="cx"> m_mousePressed = false;
</span><span class="cx"> bool swallowEvent;
</span><del>- LayoutPoint viewportPos = v->windowToContents(event.position());
</del><ins>+ LayoutPoint viewportPos = view->windowToContents(event.position());
</ins><span class="cx"> HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><span class="cx"> MouseEventWithHitTestResults mouseEvent = doc->prepareMouseEvent(request, viewportPos, event);
</span><span class="cx">
</span><ins>+ // Do not show context menus when clicking on scrollbars.
+ if (mouseEvent.scrollbar() || view->scrollbarAtPoint(event.position()))
+ return false;
+
</ins><span class="cx"> if (m_frame.editor().behavior().shouldSelectOnContextualMenuClick()
</span><span class="cx"> && !m_frame.selection().contains(viewportPos)
</span><del>- && !mouseEvent.scrollbar()
</del><span class="cx"> // FIXME: In the editable case, word selection sometimes selects content that isn't underneath the mouse.
</span><span class="cx"> // If the selection is non-editable, we do word selection to make it easier to use the contextual menu items
</span><span class="cx"> // available for text selections. But only if we're above text.
</span></span></pre>
</div>
</div>
</body>
</html>