<!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>[175677] branches/safari-600.3-branch/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/175677">175677</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-05 22:02:09 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175637">r175637</a>. <rdar://problems/18877675></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebPageWebPagemessagesin">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebPagemacWebPageMacmm">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175676 => 175677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 05:59:43 UTC (rev 175676)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-06 06:02:09 UTC (rev 175677)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2014-11-05 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175637. <rdar://problem/18877675>
+
+ 2014-11-05 Tim Horton <timothy_horton@apple.com>
+
+ Select Data Detectors results instead of just highlighting them
+ https://bugs.webkit.org/show_bug.cgi?id=138435
+ <rdar://problem/18877675>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::selectLastActionMenuRange):
+ (WebKit::WebPageProxy::selectLookupTextAtLocation): Deleted.
+ Rename selectLookupTextAtLocation to selectLastActionMenuRange.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController willOpenMenu:withEvent:]):
+ Do a real selection for single-item Data Detector menus; show the yellow highlight otherwise.
+ Adopt selectLastActionMenuRange for non-detected text.
+
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performActionMenuHitTestAtLocation):
+ (WebKit::WebPage::selectLastActionMenuRange):
+ (WebKit::WebPage::selectLookupTextAtLocation): Deleted.
+ Store the last (detected data or Lookup-derived) action menu range.
+ Select it upon selectLastActionMenuRange.
+
+
+2014-11-05 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r175635. <rdar://problem/18884674>
</span><span class="cx">
</span><span class="cx"> 2014-11-05 Conrad Shultz <conrad_shultz@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (175676 => 175677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-06 05:59:43 UTC (rev 175676)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-06 06:02:09 UTC (rev 175677)
</span><span class="lines">@@ -5207,9 +5207,9 @@
</span><span class="cx"> m_process->send(Messages::WebPage::PerformActionMenuHitTestAtLocation(point), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::selectLookupTextAtLocation(FloatPoint point)
</del><ins>+void WebPageProxy::selectLastActionMenuRange()
</ins><span class="cx"> {
</span><del>- m_process->send(Messages::WebPage::SelectLookupTextAtLocation(point), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::SelectLastActionMenuRange(), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result, IPC::MessageDecoder& decoder)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.h (175676 => 175677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-06 05:59:43 UTC (rev 175676)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-06 06:02:09 UTC (rev 175677)
</span><span class="lines">@@ -918,7 +918,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> WebHitTestResult* lastMouseMoveHitTestResult() const { return m_lastMouseMoveHitTestResult.get(); }
</span><span class="cx"> void performActionMenuHitTestAtLocation(WebCore::FloatPoint);
</span><del>- void selectLookupTextAtLocation(WebCore::FloatPoint);
</del><ins>+ void selectLastActionMenuRange();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(UNIFIED_TEXT_CHECKING)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175676 => 175677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 05:59:43 UTC (rev 175676)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-06 06:02:09 UTC (rev 175677)
</span><span class="lines">@@ -165,8 +165,13 @@
</span><span class="cx"> if (menu != _wkView.actionMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (_type == kWKActionMenuDataDetectedItem)
- [self _showTextIndicator];
</del><ins>+ if (_type == kWKActionMenuDataDetectedItem) {
+ if (menu.numberOfItems == 1)
+ [self _showTextIndicator];
+ else
+ _page->selectLastActionMenuRange();
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> if (![self isMenuForTextContent])
</span><span class="cx"> return;
</span><span class="lines">@@ -175,7 +180,7 @@
</span><span class="cx"> // will apply to. If the text is already selected, the menu will use the existing selection.
</span><span class="cx"> RefPtr<WebHitTestResult> hitTestResult = [self _hitTestResultForStage:MenuUpdateStage::MenuNeedsUpdate];
</span><span class="cx"> if (!hitTestResult->isSelected())
</span><del>- _page->selectLookupTextAtLocation([_wkView convertPoint:event.locationInWindow fromView:nil]);
</del><ins>+ _page->selectLastActionMenuRange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (175676 => 175677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-06 05:59:43 UTC (rev 175676)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-06 06:02:09 UTC (rev 175677)
</span><span class="lines">@@ -1040,7 +1040,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void performActionMenuHitTestAtLocation(WebCore::FloatPoint);
</span><span class="cx"> PassRefPtr<WebCore::Range> lookupTextAtLocation(WebCore::FloatPoint);
</span><del>- void selectLookupTextAtLocation(WebCore::FloatPoint);
</del><ins>+ void selectLastActionMenuRange();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> uint64_t m_pageID;
</span><span class="lines">@@ -1264,6 +1264,10 @@
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> WebCore::WebGLLoadPolicy m_systemWebGLPolicy;
</span><span class="cx"> #endif
</span><ins>+
+#if PLATFORM(MAC)
+ RefPtr<WebCore::Range> m_lastActionMenuRangeForSelection;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (175676 => 175677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-11-06 05:59:43 UTC (rev 175676)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-11-06 06:02:09 UTC (rev 175677)
</span><span class="lines">@@ -389,6 +389,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> PerformActionMenuHitTestAtLocation(WebCore::FloatPoint location)
</span><del>- SelectLookupTextAtLocation(WebCore::FloatPoint location)
</del><ins>+ SelectLastActionMenuRange()
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (175676 => 175677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-06 05:59:43 UTC (rev 175676)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-06 06:02:09 UTC (rev 175677)
</span><span class="lines">@@ -1176,6 +1176,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::Range> lookupRange = lookupTextAtLocation(locationInViewCooordinates);
</span><span class="cx"> actionMenuResult.lookupText = lookupRange ? lookupRange->text() : String();
</span><ins>+ m_lastActionMenuRangeForSelection = lookupRange;
</ins><span class="cx">
</span><span class="cx"> if (Image* image = hitTestResult.image()) {
</span><span class="cx"> actionMenuResult.image = ShareableBitmap::createShareable(IntSize(image->size()), ShareableBitmap::SupportsAlpha);
</span><span class="lines">@@ -1191,6 +1192,7 @@
</span><span class="cx"> if (actionMenuResult.actionContext) {
</span><span class="cx"> actionMenuResult.detectedDataBoundingBox = detectedDataBoundingBox;
</span><span class="cx"> actionMenuResult.detectedDataTextIndicator = textIndicatorForRange(detectedDataRange.get());
</span><ins>+ m_lastActionMenuRangeForSelection = detectedDataRange;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1227,19 +1229,10 @@
</span><span class="cx"> return rangeForDictionaryLookupAtHitTestResult(result, &options);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::selectLookupTextAtLocation(FloatPoint locationInWindowCooordinates)
</del><ins>+void WebPage::selectLastActionMenuRange()
</ins><span class="cx"> {
</span><del>- MainFrame& mainFrame = corePage()->mainFrame();
- if (!mainFrame.view() || !mainFrame.view()->renderView())
- return;
-
- IntPoint point = roundedIntPoint(locationInWindowCooordinates);
- HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint(m_page->mainFrame().view()->windowToContents(point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AllowChildFrameContent | HitTestRequest::IgnoreClipping);
- Frame* frame = result.innerNonSharedNode() ? result.innerNonSharedNode()->document().frame() : &m_page->focusController().focusedOrMainFrame();
- NSDictionary *options = nil;
- RefPtr<Range> lookupRange = rangeForDictionaryLookupAtHitTestResult(result, &options);
- if (lookupRange)
- frame->selection().setSelectedRange(lookupRange.get(), DOWNSTREAM, true);
</del><ins>+ if (m_lastActionMenuRangeForSelection)
+ corePage()->mainFrame().selection().setSelectedRange(m_lastActionMenuRangeForSelection.get(), DOWNSTREAM, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>