<!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>[177705] 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/177705">177705</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 16:14:53 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Install a TextIndicator for link immediate actions
https://bugs.webkit.org/show_bug.cgi?id=139897
<rdar://problem/19333076>
Reviewed by Anders Carlsson.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController _defaultAnimationController]):
Install the link's TextIndicator.
(-[WKImmediateActionController menuItemDidClose:]):
Dismiss the TextIndicator and clean up when the item closes.
* WebView/WebImmediateActionController.h:
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController _clearImmediateActionState]):
Tear down the TextIndicator, just like WebKit2.
(-[WebImmediateActionController _defaultAnimationController]):
Install a TextIndicator for links.
(-[WebImmediateActionController menuItemDidClose:]):
Tear down the TextIndicator when the QL preview closes.
(-[WebImmediateActionController _menuItemForDataDetectedText]):
Directly install and uninstall the TextIndicator for DataDetectors.
(-[WebImmediateActionController _showTextIndicator]): Deleted.
(-[WebImmediateActionController _hideTextIndicator]): Deleted.
Remove the isShowingTextIndicator mechanism, just like it was removed from WebKit2.
* platform/spi/mac/QuickLookMacSPI.h:
Add a new piece of SPI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacQuickLookMacSPIh">trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllerh">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllermm">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm">trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177704 => 177705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-24 00:13:48 UTC (rev 177704)
+++ trunk/Source/WebCore/ChangeLog 2014-12-24 00:14:53 UTC (rev 177705)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-23 Timothy Horton <timothy_horton@apple.com>
+
+ Install a TextIndicator for link immediate actions
+ https://bugs.webkit.org/show_bug.cgi?id=139897
+ <rdar://problem/19333076>
+
+ Reviewed by Anders Carlsson.
+
+ * platform/spi/mac/QuickLookMacSPI.h:
+ Add a new piece of SPI.
+
</ins><span class="cx"> 2014-12-23 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Rename WebContext to WebProcessPool
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacQuickLookMacSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h (177704 => 177705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2014-12-24 00:13:48 UTC (rev 177704)
+++ trunk/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2014-12-24 00:14:53 UTC (rev 177705)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> - (NSView *)menuItem:(NSMenuItem *)menuItem viewAtScreenPoint:(NSPoint)screenPoint;
</span><span class="cx"> - (id<QLPreviewItem>)menuItem:(NSMenuItem *)menuItem previewItemAtPoint:(NSPoint)point;
</span><span class="cx"> - (NSRectEdge)menuItem:(NSMenuItem *)menuItem preferredEdgeForPoint:(NSPoint)point;
</span><ins>+- (void)menuItemDidClose:(NSMenuItem *)menuItem;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177704 => 177705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-24 00:13:48 UTC (rev 177704)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-24 00:14:53 UTC (rev 177705)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-12-23 Timothy Horton <timothy_horton@apple.com>
+
+ Install a TextIndicator for link immediate actions
+ https://bugs.webkit.org/show_bug.cgi?id=139897
+ <rdar://problem/19333076>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController _clearImmediateActionState]):
+ Tear down the TextIndicator, just like WebKit2.
+
+ (-[WebImmediateActionController _defaultAnimationController]):
+ Install a TextIndicator for links.
+
+ (-[WebImmediateActionController menuItemDidClose:]):
+ Tear down the TextIndicator when the QL preview closes.
+
+ (-[WebImmediateActionController _menuItemForDataDetectedText]):
+ Directly install and uninstall the TextIndicator for DataDetectors.
+
+ (-[WebImmediateActionController _showTextIndicator]): Deleted.
+ (-[WebImmediateActionController _hideTextIndicator]): Deleted.
+ Remove the isShowingTextIndicator mechanism, just like it was removed from WebKit2.
+
</ins><span class="cx"> 2014-12-20 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] add optimized fullscreen API
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h (177704 => 177705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h 2014-12-24 00:13:48 UTC (rev 177704)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h 2014-12-24 00:14:53 UTC (rev 177705)
</span><span class="lines">@@ -33,11 +33,6 @@
</span><span class="cx"> @class DDActionContext;
</span><span class="cx"> @class WebView;
</span><span class="cx">
</span><del>-namespace WebCore {
-class Range;
-class TextIndicator;
-}
-
</del><span class="cx"> @interface WebImmediateActionController : NSObject <NSImmediateActionGestureRecognizerDelegate> {
</span><span class="cx"> @private
</span><span class="cx"> WebView *_webView;
</span><span class="lines">@@ -46,8 +41,6 @@
</span><span class="cx"> NSImmediateActionGestureRecognizer *_immediateActionRecognizer;
</span><span class="cx">
</span><span class="cx"> RetainPtr<DDActionContext> _currentActionContext;
</span><del>- RefPtr<WebCore::Range> _currentDetectedDataRange;
- RefPtr<WebCore::TextIndicator> _currentDetectedDataTextIndicator;
</del><span class="cx"> BOOL _isShowingTextIndicator;
</span><span class="cx"> BOOL _hasActivatedActionContext;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (177704 => 177705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2014-12-24 00:13:48 UTC (rev 177704)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2014-12-24 00:14:53 UTC (rev 177705)
</span><span class="lines">@@ -100,6 +100,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)_clearImmediateActionState
</span><span class="cx"> {
</span><ins>+ [_webView _clearTextIndicator];
+
</ins><span class="cx"> _type = WebImmediateActionNone;
</span><span class="cx"> _currentActionContext = nil;
</span><span class="cx"> }
</span><span class="lines">@@ -182,9 +184,13 @@
</span><span class="cx"> {
</span><span class="cx"> NSURL *url = _hitTestResult.absoluteLinkURL();
</span><span class="cx"> NSString *absoluteURLString = [url absoluteString];
</span><del>- if (url && WebCore::protocolIsInHTTPFamily(absoluteURLString)) {
</del><ins>+ if (url && WebCore::protocolIsInHTTPFamily(absoluteURLString) && _hitTestResult.innerNode()) {
</ins><span class="cx"> _type = WebImmediateActionLinkPreview;
</span><span class="cx">
</span><ins>+ RefPtr<Range> linkRange = rangeOfContents(*_hitTestResult.innerNode());
+ RefPtr<TextIndicator> linkTextIndicator = TextIndicator::createWithRange(*linkRange, TextIndicatorPresentationTransition::FadeIn);
+ [_webView _setTextIndicator:linkTextIndicator.get() fadeOut:NO];
+
</ins><span class="cx"> RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem = [NSMenuItem standardQuickLookMenuItem];
</span><span class="cx"> [qlPreviewLinkItem setPreviewStyle:QLPreviewStylePopover];
</span><span class="cx"> [qlPreviewLinkItem setDelegate:self];
</span><span class="lines">@@ -250,6 +256,11 @@
</span><span class="cx"> return NSMaxYEdge;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)menuItemDidClose:(NSMenuItem *)menuItem
+{
+ [self _clearImmediateActionState];
+}
+
</ins><span class="cx"> #pragma mark Data Detectors actions
</span><span class="cx">
</span><span class="cx"> - (NSMenuItem *)_menuItemForDataDetectedText
</span><span class="lines">@@ -282,15 +293,14 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _currentDetectedDataTextIndicator = TextIndicator::createWithRange(*detectedDataRange, TextIndicatorPresentationTransition::FadeIn);
</del><ins>+ RefPtr<TextIndicator> detectedDataTextIndicator = TextIndicator::createWithRange(*detectedDataRange, TextIndicatorPresentationTransition::FadeIn);
</ins><span class="cx">
</span><span class="cx"> _currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {
</span><span class="cx"> } interactionChangedHandler:^() {
</span><del>- [self _showTextIndicator];
</del><ins>+ [_webView _setTextIndicator:detectedDataTextIndicator.get() fadeOut:NO];
</ins><span class="cx"> } interactionStoppedHandler:^() {
</span><del>- [self _hideTextIndicator];
</del><ins>+ [_webView _clearTextIndicator];
</ins><span class="cx"> }];
</span><del>- _currentDetectedDataRange = detectedDataRange;
</del><span class="cx">
</span><span class="cx"> [_currentActionContext setHighlightFrame:[_webView.window convertRectToScreen:detectedDataBoundingBox]];
</span><span class="cx">
</span><span class="lines">@@ -370,28 +380,6 @@
</span><span class="cx"> return [_webView _animationControllerForDictionaryLookupPopupInfo:dictionaryPopupInfo];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark Text Indicator
-
-- (void)_showTextIndicator
-{
- if (_isShowingTextIndicator)
- return;
-
- if (_type == WebImmediateActionDataDetectedItem && _currentDetectedDataTextIndicator) {
- [_webView _setTextIndicator:_currentDetectedDataTextIndicator.get() fadeOut:NO];
- _isShowingTextIndicator = YES;
- }
-}
-
-- (void)_hideTextIndicator
-{
- if (!_isShowingTextIndicator)
- return;
-
- [_webView _clearTextIndicator];
- _isShowingTextIndicator = NO;
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177704 => 177705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-24 00:13:48 UTC (rev 177704)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-24 00:14:53 UTC (rev 177705)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-12-23 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Install a TextIndicator for link immediate actions
+ https://bugs.webkit.org/show_bug.cgi?id=139897
+ <rdar://problem/19333076>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _defaultAnimationController]):
+ Install the link's TextIndicator.
+
+ (-[WKImmediateActionController menuItemDidClose:]):
+ Dismiss the TextIndicator and clean up when the item closes.
+
+2014-12-23 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Expose ElementBoundingBox on WKHitTestResult
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139895
</span><span class="cx"> <rdar://problem/19333075>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (177704 => 177705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-24 00:13:48 UTC (rev 177704)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-24 00:14:53 UTC (rev 177705)
</span><span class="lines">@@ -219,6 +219,9 @@
</span><span class="cx"> if (!absoluteLinkURL.isEmpty() && WebCore::protocolIsInHTTPFamily(absoluteLinkURL)) {
</span><span class="cx"> _type = kWKImmediateActionLinkPreview;
</span><span class="cx">
</span><ins>+ if (TextIndicator *textIndicator = _hitTestResult.linkTextIndicator.get())
+ _page->setTextIndicator(textIndicator->data(), false);
+
</ins><span class="cx"> RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem = [NSMenuItem standardQuickLookMenuItem];
</span><span class="cx"> [qlPreviewLinkItem setPreviewStyle:QLPreviewStylePopover];
</span><span class="cx"> [qlPreviewLinkItem setDelegate:self];
</span><span class="lines">@@ -279,6 +282,11 @@
</span><span class="cx"> return NSMaxYEdge;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)menuItemDidClose:(NSMenuItem *)menuItem
+{
+ [self _clearImmediateActionState];
+}
+
</ins><span class="cx"> #pragma mark Data Detectors actions
</span><span class="cx">
</span><span class="cx"> - (NSMenuItem *)_menuItemForDataDetectedText
</span></span></pre>
</div>
</div>
</body>
</html>