<!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>[186694] trunk/Tools</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/186694">186694</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-07-10 16:09:59 -0700 (Fri, 10 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Unable to dismiss context menu during test runs
https://bugs.webkit.org/show_bug.cgi?id=146836
Reviewed by Tim Horton.
Since Context Menus are modal, the test system would block on the displayed context menu,
causing tests to fail. Instead, we should do what WK1 was doing, which is to perform the
mouse click and generate the menu contents, but not ask AppKit to display it.
Drive-by fix: We did not handle 'escape' key presses. This is also fixed.
* DumpRenderTree/mac/EventSendingController.mm:
(-[EventSendingController keyDown:withModifiers:withLocation:]): Handle the 'escape' character.
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
(WTR::EventSendingController::mouseMoveTo): Keep track of the current mouse position.
(WTR::EventSendingController::contextClick): Don't emit an actual context menu invocation and then
copy the menu items. Instead, use WKBundlePageCopyContentMenuAtPointInWindow to do all the same
work without actually calling on AppKit to display the menu.
ask WebCore to do all the work EXCEPT displaying the menu.
* WebKitTestRunner/InjectedBundle/EventSendingController.h:
* WebKitTestRunner/mac/EventSenderProxy.mm:
(WTR::EventSenderProxy::keyDown): Handle the 'escape' character.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacEventSendingControllermm">trunk/Tools/DumpRenderTree/mac/EventSendingController.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllerh">trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacEventSenderProxymm">trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (186693 => 186694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-10 22:29:07 UTC (rev 186693)
+++ trunk/Tools/ChangeLog 2015-07-10 23:09:59 UTC (rev 186694)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-07-10 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Unable to dismiss context menu during test runs
+ https://bugs.webkit.org/show_bug.cgi?id=146836
+
+ Reviewed by Tim Horton.
+
+ Since Context Menus are modal, the test system would block on the displayed context menu,
+ causing tests to fail. Instead, we should do what WK1 was doing, which is to perform the
+ mouse click and generate the menu contents, but not ask AppKit to display it.
+
+ Drive-by fix: We did not handle 'escape' key presses. This is also fixed.
+
+ * DumpRenderTree/mac/EventSendingController.mm:
+ (-[EventSendingController keyDown:withModifiers:withLocation:]): Handle the 'escape' character.
+ * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+ (WTR::EventSendingController::mouseMoveTo): Keep track of the current mouse position.
+ (WTR::EventSendingController::contextClick): Don't emit an actual context menu invocation and then
+ copy the menu items. Instead, use WKBundlePageCopyContentMenuAtPointInWindow to do all the same
+ work without actually calling on AppKit to display the menu.
+ ask WebCore to do all the work EXCEPT displaying the menu.
+ * WebKitTestRunner/InjectedBundle/EventSendingController.h:
+ * WebKitTestRunner/mac/EventSenderProxy.mm:
+ (WTR::EventSenderProxy::keyDown): Handle the 'escape' character.
+
</ins><span class="cx"> 2015-07-09 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> It should be possible to run the OSR exit fuzzer
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacEventSendingControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (186693 => 186694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2015-07-10 22:29:07 UTC (rev 186693)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2015-07-10 23:09:59 UTC (rev 186694)
</span><span class="lines">@@ -968,6 +968,8 @@
</span><span class="cx"> keyCode = 0x02;
</span><span class="cx"> else if ([character isEqualToString:@"e"])
</span><span class="cx"> keyCode = 0x0E;
</span><ins>+ else if ([character isEqualToString:@"\x1b"])
+ keyCode = 0x1B;
</ins><span class="cx">
</span><span class="cx"> KeyMappingEntry table[] = {
</span><span class="cx"> {0x2F, 0x41, '.', nil},
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp (186693 => 186694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2015-07-10 22:29:07 UTC (rev 186693)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2015-07-10 23:09:59 UTC (rev 186694)
</span><span class="lines">@@ -250,6 +250,8 @@
</span><span class="cx"> WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
</span><span class="cx"> WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
</span><span class="cx">
</span><ins>+ m_position = WKPointMake(x, y);
+
</ins><span class="cx"> WKBundlePagePostSynchronousMessage(InjectedBundle::singleton().page()->page(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -473,11 +475,7 @@
</span><span class="cx"> WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
</span><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- // Do mouse context click.
- mouseDown(2, 0);
- mouseUp(2, 0);
-
- WKRetainPtr<WKArrayRef> menuEntries = adoptWK(WKBundlePageCopyContextMenuItems(page));
</del><ins>+ WKRetainPtr<WKArrayRef> menuEntries = adoptWK(WKBundlePageCopyContextMenuAtPointInWindow(page, m_position));
</ins><span class="cx"> JSValueRef arrayResult = JSObjectMakeArray(context, 0, 0, 0);
</span><span class="cx"> JSObjectRef arrayObj = JSValueToObject(context, arrayResult, 0);
</span><span class="cx"> size_t entriesSize = WKArrayGetSize(menuEntries.get());
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h (186693 => 186694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h 2015-07-10 22:29:07 UTC (rev 186693)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h 2015-07-10 23:09:59 UTC (rev 186694)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> EventSendingController();
</span><ins>+ WKPoint m_position;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WTR
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacEventSenderProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (186693 => 186694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2015-07-10 22:29:07 UTC (rev 186693)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2015-07-10 23:09:59 UTC (rev 186694)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -563,6 +563,8 @@
</span><span class="cx"> keyCode = 0x02;
</span><span class="cx"> else if ([character isEqualToString:@"e"])
</span><span class="cx"> keyCode = 0x0E;
</span><ins>+ else if ([character isEqualToString:@"\x1b"])
+ keyCode = 0x1B;
</ins><span class="cx">
</span><span class="cx"> KeyMappingEntry table[] = {
</span><span class="cx"> {0x2F, 0x41, '.', nil},
</span></span></pre>
</div>
</div>
</body>
</html>