<!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>[176883] trunk/Source/WebKit2</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/176883">176883</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-12-05 15:59:18 -0800 (Fri, 05 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>If the action menu hit test times out, a menu with a single separator appears
https://bugs.webkit.org/show_bug.cgi?id=139320
<rdar://problem/19158331>
Reviewed by Beth Dakin.
* UIProcess/mac/WKActionMenuController.h:
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController menuNeedsUpdate:]):
(-[WKActionMenuController _defaultMenuItems]):
Add a new "TimedOut" state, which we get into if the sync wait for
didPerformActionMenuHitTest times out. In this case, we'll drop the
separator item and give up on the menu. This way, the menu will never
have just a single separator item at the end of menuNeedsUpdate:.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllerh">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176882 => 176883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-05 23:56:20 UTC (rev 176882)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-05 23:59:18 UTC (rev 176883)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-05 Tim Horton <timothy_horton@apple.com>
+
+ If the action menu hit test times out, a menu with a single separator appears
+ https://bugs.webkit.org/show_bug.cgi?id=139320
+ <rdar://problem/19158331>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/mac/WKActionMenuController.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController menuNeedsUpdate:]):
+ (-[WKActionMenuController _defaultMenuItems]):
+ Add a new "TimedOut" state, which we get into if the sync wait for
+ didPerformActionMenuHitTest times out. In this case, we'll drop the
+ separator item and give up on the menu. This way, the menu will never
+ have just a single separator item at the end of menuNeedsUpdate:.
+
</ins><span class="cx"> 2014-12-05 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Gardening: speculative build fix for GTK builds.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (176882 => 176883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-12-05 23:56:20 UTC (rev 176882)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-12-05 23:59:18 UTC (rev 176883)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> enum class ActionMenuState {
</span><span class="cx"> None = 0,
</span><span class="cx"> Pending,
</span><ins>+ TimedOut,
</ins><span class="cx"> Ready
</span><span class="cx"> };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176882 => 176883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-05 23:56:20 UTC (rev 176882)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-05 23:59:18 UTC (rev 176883)
</span><span class="lines">@@ -889,8 +889,11 @@
</span><span class="cx"> // FIXME: We need to be able to cancel this if the menu goes away.
</span><span class="cx"> // FIXME: Connection can be null if the process is closed; we should clean up better in that case.
</span><span class="cx"> if (_state == ActionMenuState::Pending) {
</span><del>- if (auto* connection = _page->process().connection())
- connection->waitForAndDispatchImmediately<Messages::WebPageProxy::DidPerformActionMenuHitTest>(_page->pageID(), std::chrono::milliseconds(500));
</del><ins>+ if (auto* connection = _page->process().connection()) {
+ bool receivedReply = connection->waitForAndDispatchImmediately<Messages::WebPageProxy::DidPerformActionMenuHitTest>(_page->pageID(), std::chrono::milliseconds(500));
+ if (!receivedReply)
+ _state = ActionMenuState::TimedOut;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (_state != ActionMenuState::Ready)
</span><span class="lines">@@ -1093,7 +1096,7 @@
</span><span class="cx"> RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</span><span class="cx"> if (!hitTestResult) {
</span><span class="cx"> _type = kWKActionMenuNone;
</span><del>- return _state != ActionMenuState::Ready ? @[ [NSMenuItem separatorItem] ] : @[ ];
</del><ins>+ return _state == ActionMenuState::Pending ? @[ [NSMenuItem separatorItem] ] : @[ ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String absoluteLinkURL = hitTestResult->absoluteLinkURL();
</span><span class="lines">@@ -1164,7 +1167,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _type = kWKActionMenuNone;
</span><del>- return _state != ActionMenuState::Ready ? @[ [NSMenuItem separatorItem] ] : @[ ];
</del><ins>+ return _state == ActionMenuState::Pending ? @[ [NSMenuItem separatorItem] ] : @[ ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_updateActionMenuItems
</span></span></pre>
</div>
</div>
</body>
</html>