<!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>[175831] trunk/Source/WebKit/mac</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/175831">175831</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-11-10 14:12:01 -0800 (Mon, 10 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WK1: Text is getting selected even when an action menu fails to invoke
https://bugs.webkit.org/show_bug.cgi?id=138576
-and corresponding-
rdar://problem/18931330
Reviewed by Tim Horton.
Selection changes should happen in willOpenMenu: instead of prepareForMenu:
* WebView/WebActionMenuController.h:
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController prepareForMenu:withEvent:]):
(-[WebActionMenuController willOpenMenu:withEvent:]):
_selectLookupText no longer needs to return a BOOL indicating success or failure.
(-[WebActionMenuController _selectLookupText]):
(-[WebActionMenuController _defaultMenuItemsForHitTestResult:]):
Pass willOpenMenu: on to the controller.
* WebView/WebView.mm:
(-[WebView willOpenMenu:withEvent:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllerh">trunk/Source/WebKit/mac/WebView/WebActionMenuController.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllermm">trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (175830 => 175831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-10 22:05:52 UTC (rev 175830)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-10 22:12:01 UTC (rev 175831)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-11-10 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><ins>+ WK1: Text is getting selected even when an action menu fails to invoke
+ https://bugs.webkit.org/show_bug.cgi?id=138576
+ -and corresponding-
+ rdar://problem/18931330
+
+ Reviewed by Tim Horton.
+
+ Selection changes should happen in willOpenMenu: instead of prepareForMenu:
+ * WebView/WebActionMenuController.h:
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController prepareForMenu:withEvent:]):
+ (-[WebActionMenuController willOpenMenu:withEvent:]):
+
+ _selectLookupText no longer needs to return a BOOL indicating success or failure.
+ (-[WebActionMenuController _selectLookupText]):
+ (-[WebActionMenuController _defaultMenuItemsForHitTestResult:]):
+
+ Pass willOpenMenu: on to the controller.
+ * WebView/WebView.mm:
+ (-[WebView willOpenMenu:withEvent:]):
+
+2014-11-10 Beth Dakin <bdakin@apple.com>
+
</ins><span class="cx"> Speculative build fix.
</span><span class="cx">
</span><span class="cx"> * WebView/WebActionMenuController.mm:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.h (175830 => 175831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.h 2014-11-10 22:05:52 UTC (rev 175830)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.h 2014-11-10 22:12:01 UTC (rev 175831)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> - (id)initWithWebView:(WebView *)webView;
</span><span class="cx"> - (void)webViewClosed;
</span><span class="cx"> - (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event;
</span><ins>+- (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event;
</ins><span class="cx"> - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (175830 => 175831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-10 22:05:52 UTC (rev 175830)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-10 22:12:01 UTC (rev 175831)
</span><span class="lines">@@ -118,9 +118,6 @@
</span><span class="cx"> WebElementDictionary *hitTestResult = [self performHitTestAtPoint:[_webView convertPoint:event.locationInWindow fromView:nil]];
</span><span class="cx"> NSArray *menuItems = [self _defaultMenuItemsForHitTestResult:hitTestResult];
</span><span class="cx">
</span><del>- if (_type != WebActionMenuReadOnlyText)
- [[_webView _selectedOrMainFrame] _clearSelection];
-
</del><span class="cx"> // Allow clients to customize the menu items.
</span><span class="cx"> if ([[_webView UIDelegate] respondsToSelector:@selector(_webView:actionMenuItemsForHitTestResult:withType:defaultActionMenuItems:)])
</span><span class="cx"> menuItems = [[_webView UIDelegate] _webView:_webView actionMenuItemsForHitTestResult:hitTestResult withType:_type defaultActionMenuItems:menuItems];
</span><span class="lines">@@ -129,6 +126,22 @@
</span><span class="cx"> [actionMenu addItem:item];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event
+{
+ if (menu != _webView.actionMenu)
+ return;
+
+ if (_type != WebActionMenuReadOnlyText) {
+ [[_webView _selectedOrMainFrame] _clearSelection];
+ return;
+ }
+
+ // Action menus for text should highlight the text so that it is clear what the action menu actions
+ // will apply to. If the text is already selected, the menu will use the existing selection.
+ if (!_hitTestResult.isSelected())
+ [self _selectLookupText];
+}
+
</ins><span class="cx"> - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><span class="cx"> if (menu != _webView.actionMenu)
</span><span class="lines">@@ -270,19 +283,19 @@
</span><span class="cx"> WKShowWordDefinitionWindow(popupInfo.attributedString.get(), textBaselineOrigin, popupInfo.options.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_selectLookupText
</del><ins>+- (void)_selectLookupText
</ins><span class="cx"> {
</span><span class="cx"> NSDictionary *options = nil;
</span><span class="cx"> RefPtr<Range> lookupRange = rangeForDictionaryLookupAtHitTestResult(_hitTestResult, &options);
</span><span class="cx"> if (!lookupRange)
</span><del>- return false;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> Frame* frame = _hitTestResult.innerNode()->document().frame();
</span><span class="cx"> if (!frame)
</span><del>- return false;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> frame->selection().setSelectedRange(lookupRange.get(), DOWNSTREAM, true);
</span><del>- return true;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static DictionaryPopupInfo performDictionaryLookupForSelection(Frame* frame, const VisibleSelection& selection)
</span><span class="lines">@@ -406,10 +419,6 @@
</span><span class="cx">
</span><span class="cx"> Node* node = _hitTestResult.innerNode();
</span><span class="cx"> if (node && node->isTextNode()) {
</span><del>- if (![[hitTestResult objectForKey:WebElementIsSelectedKey] boolValue]) {
- if (![self _selectLookupText])
- return @[ ];
- }
</del><span class="cx"> _type = WebActionMenuReadOnlyText;
</span><span class="cx"> return [self _defaultMenuItemsForText:hitTestResult];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (175830 => 175831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-10 22:05:52 UTC (rev 175830)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-10 22:12:01 UTC (rev 175831)
</span><span class="lines">@@ -8544,6 +8544,14 @@
</span><span class="cx"> [_private->actionMenuController prepareForMenu:menu withEvent:event];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event
+{
+ if (menu != self.actionMenu)
+ return;
+
+ [_private->actionMenuController willOpenMenu:menu withEvent:event];
+}
+
</ins><span class="cx"> - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><span class="cx"> if (menu != self.actionMenu)
</span></span></pre>
</div>
</div>
</body>
</html>