<!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>[176220] trunk/Source</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/176220">176220</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-11-17 12:09:50 -0800 (Mon, 17 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace action menus should focus the HitTestResult and create an insertion
point
https://bugs.webkit.org/show_bug.cgi?id=138786
-and corresponding-
rdar://problem/18944893
Reviewed by Tim Horton.
Whitespace menus should cause the HitTestResult to be focused, and they should set
the selection based on the HitTest location.
Source/WebKit/mac:
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController isMenuForTextContent]):
(-[WebActionMenuController focusAndSelectHitTestResult]):
(-[WebActionMenuController willOpenMenu:withEvent:]):
Source/WebKit2:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::focusAndSelectLastActionMenuHitTestResult):
* UIProcess/WebPageProxy.h:
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController isMenuForTextContent]):
(-[WKActionMenuController willOpenMenu:withEvent:]):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::performActionMenuHitTestAtLocation):
(WebKit::WebPage::focusAndSelectLastActionMenuHitTestResult):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllermm">trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.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 (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-11-17 Beth Dakin <bdakin@apple.com>
+
+ Whitespace action menus should focus the HitTestResult and create an insertion
+ point
+ https://bugs.webkit.org/show_bug.cgi?id=138786
+ -and corresponding-
+ rdar://problem/18944893
+
+ Reviewed by Tim Horton.
+
+ Whitespace menus should cause the HitTestResult to be focused, and they should set
+ the selection based on the HitTest location.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController isMenuForTextContent]):
+ (-[WebActionMenuController focusAndSelectHitTestResult]):
+ (-[WebActionMenuController willOpenMenu:withEvent:]):
+
</ins><span class="cx"> 2014-11-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] QuartzCore SPI not available in public SDK
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #import <WebCore/Editor.h>
</span><span class="cx"> #import <WebCore/Element.h>
</span><span class="cx"> #import <WebCore/EventHandler.h>
</span><ins>+#import <WebCore/FocusController.h>
</ins><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/HTMLConverter.h>
</span><span class="lines">@@ -150,9 +151,29 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)isMenuForTextContent
</span><span class="cx"> {
</span><del>- return _type == WebActionMenuReadOnlyText || _type == WebActionMenuEditableText || _type == WebActionMenuEditableTextWithSuggestions || _type == WebActionMenuWhitespaceInEditableArea;
</del><ins>+ return _type == WebActionMenuReadOnlyText || _type == WebActionMenuEditableText || _type == WebActionMenuEditableTextWithSuggestions;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)focusAndSelectHitTestResult
+{
+ if (!_hitTestResult.isContentEditable())
+ return;
+
+ Element* element = _hitTestResult.innerElement();
+ if (!element)
+ return;
+
+ auto renderer = element->renderer();
+ if (!renderer)
+ return;
+
+ Frame& frame = renderer->frame();
+
+ frame.page()->focusController().setFocusedElement(element, element->document().frame());
+ VisiblePosition position = renderer->positionForPoint(_hitTestResult.localPoint(), nullptr);
+ frame.selection().setSelection(position);
+}
+
</ins><span class="cx"> - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><span class="cx"> if (menu != _webView.actionMenu)
</span><span class="lines">@@ -171,6 +192,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (_type == WebActionMenuWhitespaceInEditableArea) {
+ [self focusAndSelectHitTestResult];
+ return;
+ }
+
</ins><span class="cx"> if (![self isMenuForTextContent]) {
</span><span class="cx"> [[_webView _selectedOrMainFrame] _clearSelection];
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-11-17 Beth Dakin <bdakin@apple.com>
+
+ Whitespace action menus should focus the HitTestResult and create an insertion
+ point
+ https://bugs.webkit.org/show_bug.cgi?id=138786
+ -and corresponding-
+ rdar://problem/18944893
+
+ Reviewed by Tim Horton.
+
+ Whitespace menus should cause the HitTestResult to be focused, and they should set
+ the selection based on the HitTest location.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::focusAndSelectLastActionMenuHitTestResult):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController isMenuForTextContent]):
+ (-[WKActionMenuController willOpenMenu:withEvent:]):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performActionMenuHitTestAtLocation):
+ (WebKit::WebPage::focusAndSelectLastActionMenuHitTestResult):
+
</ins><span class="cx"> 2014-11-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] AVKit and MediaPlayer SPI are not available in public SDK
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -5323,6 +5323,11 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SelectLastActionMenuRange(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::focusAndSelectLastActionMenuHitTestResult()
+{
+ m_process->send(Messages::WebPage::FocusAndSelectLastActionMenuHitTestResult(), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result, IPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -932,6 +932,7 @@
</span><span class="cx"> WebHitTestResult* lastMouseMoveHitTestResult() const { return m_lastMouseMoveHitTestResult.get(); }
</span><span class="cx"> void performActionMenuHitTestAtLocation(WebCore::FloatPoint);
</span><span class="cx"> void selectLastActionMenuRange();
</span><ins>+ void focusAndSelectLastActionMenuHitTestResult();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL) && HAVE(ACCESSIBILITY) && defined(HAVE_ECORE_X)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)isMenuForTextContent
</span><span class="cx"> {
</span><del>- return _type == kWKActionMenuReadOnlyText || _type == kWKActionMenuEditableText || _type == kWKActionMenuEditableTextWithSuggestions || _type == kWKActionMenuWhitespaceInEditableArea;
</del><ins>+ return _type == kWKActionMenuReadOnlyText || _type == kWKActionMenuEditableText || _type == kWKActionMenuEditableTextWithSuggestions;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="lines">@@ -204,6 +204,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (_type == kWKActionMenuWhitespaceInEditableArea) {
+ _page->focusAndSelectLastActionMenuHitTestResult();
+ return;
+ }
+
</ins><span class="cx"> if (![self isMenuForTextContent]) {
</span><span class="cx"> _page->clearSelection();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> #include <WebCore/DragData.h>
</span><span class="cx"> #include <WebCore/Editor.h>
</span><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><ins>+#include <WebCore/HitTestResult.h>
</ins><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <WebCore/IntSizeHash.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="lines">@@ -1057,6 +1058,7 @@
</span><span class="cx"> void performActionMenuHitTestAtLocation(WebCore::FloatPoint);
</span><span class="cx"> PassRefPtr<WebCore::Range> lookupTextAtLocation(WebCore::FloatPoint);
</span><span class="cx"> void selectLastActionMenuRange();
</span><ins>+ void focusAndSelectLastActionMenuHitTestResult();
</ins><span class="cx">
</span><span class="cx"> void dataDetectorsDidPresentUI();
</span><span class="cx"> void dataDetectorsDidChangeUI();
</span><span class="lines">@@ -1292,6 +1294,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> RefPtr<WebCore::Range> m_lastActionMenuRangeForSelection;
</span><ins>+ WebCore::HitTestResult m_lastActionMenuHitTestResult;
</ins><span class="cx"> RefPtr<WebPageOverlay> m_lastActionMenuHitPageOverlay;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -400,6 +400,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> PerformActionMenuHitTestAtLocation(WebCore::FloatPoint location)
</span><span class="cx"> SelectLastActionMenuRange()
</span><ins>+ FocusAndSelectLastActionMenuHitTestResult()
</ins><span class="cx"> DataDetectorsDidPresentUI()
</span><span class="cx"> DataDetectorsDidChangeUI()
</span><span class="cx"> DataDetectorsDidHideUI()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (176219 => 176220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-17 19:58:22 UTC (rev 176219)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-17 20:09:50 UTC (rev 176220)
</span><span class="lines">@@ -1008,6 +1008,7 @@
</span><span class="cx"> RefPtr<WebCore::Range> lookupRange = lookupTextAtLocation(locationInViewCooordinates);
</span><span class="cx"> actionMenuResult.lookupText = lookupRange ? lookupRange->text() : String();
</span><span class="cx"> m_lastActionMenuRangeForSelection = lookupRange;
</span><ins>+ m_lastActionMenuHitTestResult = hitTestResult;
</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">@@ -1081,6 +1082,24 @@
</span><span class="cx"> corePage()->mainFrame().selection().setSelectedRange(m_lastActionMenuRangeForSelection.get(), DOWNSTREAM, true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::focusAndSelectLastActionMenuHitTestResult()
+{
+ if (!m_lastActionMenuHitTestResult.isContentEditable())
+ return;
+
+ Element* element = m_lastActionMenuHitTestResult.innerElement();
+ if (!element)
+ return;
+
+ auto renderer = element->renderer();
+ if (!renderer)
+ return;
+
+ m_page->focusController().setFocusedElement(element, element->document().frame());
+ VisiblePosition position = renderer->positionForPoint(m_lastActionMenuHitTestResult.localPoint(), nullptr);
+ element->document().frame()->selection().setSelection(position);
+}
+
</ins><span class="cx"> void WebPage::dataDetectorsDidPresentUI()
</span><span class="cx"> {
</span><span class="cx"> if (m_lastActionMenuHitPageOverlay)
</span></span></pre>
</div>
</div>
</body>
</html>