<!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>[177186] 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/177186">177186</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 15:11:41 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the preview popover to WebImmediateActionController
https://bugs.webkit.org/show_bug.cgi?id=139563
<rdar://problem/19208291>
Reviewed by Beth Dakin.
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController _defaultMenuItemsForLink]):
(-[WebActionMenuController menuItem:viewAtScreenPoint:]): Deleted.
(-[WebActionMenuController menuItem:previewItemAtPoint:]): Deleted.
(-[WebActionMenuController menuItem:preferredEdgeForPoint:]): Deleted.
* WebView/WebImmediateActionController.h:
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController webViewClosed]):
(-[WebImmediateActionController immediateActionRecognizerWillPrepare:]):
(-[WebImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
(-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
(-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
(-[WebImmediateActionController _updateImmediateActionItem]):
(-[WebImmediateActionController menuItem:viewAtScreenPoint:]):
(-[WebImmediateActionController menuItem:previewItemAtPoint:]):
(-[WebImmediateActionController menuItem:preferredEdgeForPoint:]):
Move page preview popover related code to WebImmediateActionController.
* WebView/WebUIDelegatePrivate.h:
Add a link preview type.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
Pass the gesture recognizer to the WebImmediateActionController.
* UIProcess/mac/WKImmediateActionController.h:
Remove an unnecessary forward declaration.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController willDestroyView:]):
Clear the immediate action recognizer when the view goes away.</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="#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="#trunkSourceWebKitmacWebViewWebUIDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKImmediateActionControllerh">trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h</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="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2014-12-11 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Move the preview popover to WebImmediateActionController
+ https://bugs.webkit.org/show_bug.cgi?id=139563
+ <rdar://problem/19208291>
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForLink]):
+ (-[WebActionMenuController menuItem:viewAtScreenPoint:]): Deleted.
+ (-[WebActionMenuController menuItem:previewItemAtPoint:]): Deleted.
+ (-[WebActionMenuController menuItem:preferredEdgeForPoint:]): Deleted.
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController webViewClosed]):
+ (-[WebImmediateActionController immediateActionRecognizerWillPrepare:]):
+ (-[WebImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
+ (-[WebImmediateActionController _updateImmediateActionItem]):
+ (-[WebImmediateActionController menuItem:viewAtScreenPoint:]):
+ (-[WebImmediateActionController menuItem:previewItemAtPoint:]):
+ (-[WebImmediateActionController menuItem:preferredEdgeForPoint:]):
+ Move page preview popover related code to WebImmediateActionController.
+
+ * WebView/WebUIDelegatePrivate.h:
+ Add a link preview type.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ Pass the gesture recognizer to the WebImmediateActionController.
+
+2014-12-11 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Fix the build.
</span><span class="cx">
</span><span class="cx"> * WebView/WebImmediateActionController.h:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -71,15 +71,9 @@
</span><span class="cx"> #import <objc/objc-class.h>
</span><span class="cx"> #import <objc/objc.h>
</span><span class="cx">
</span><del>-SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, QuickLookUI)
-SOFT_LINK_CLASS(QuickLookUI, QLPreviewMenuItem)
-
</del><span class="cx"> SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, ImageKit)
</span><span class="cx"> SOFT_LINK_CLASS(ImageKit, IKSlideshow)
</span><span class="cx">
</span><del>-@interface WebActionMenuController () <QLPreviewMenuItemDelegate>
-@end
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @implementation WebActionMenuController
</span><span class="lines">@@ -268,20 +262,9 @@
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForLink
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSMenuItem> openLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagOpenLinkInDefaultBrowser];
</span><del>-
- BOOL shouldUseStandardQuickLookPreview = [NSMenuItem respondsToSelector:@selector(standardQuickLookMenuItem)];
- RetainPtr<NSMenuItem> previewLinkItem;
- RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem;
- if (shouldUseStandardQuickLookPreview) {
- qlPreviewLinkItem = [NSMenuItem standardQuickLookMenuItem];
- [qlPreviewLinkItem setPreviewStyle:QLPreviewStylePopover];
- [qlPreviewLinkItem setDelegate:self];
- } else
- previewLinkItem = [NSMenuItem separatorItem];
-
</del><span class="cx"> RetainPtr<NSMenuItem> readingListItem = [self _createActionMenuItemForTag:WebActionMenuItemTagAddLinkToSafariReadingList];
</span><span class="cx">
</span><del>- return @[ openLinkItem.get(), shouldUseStandardQuickLookPreview ? qlPreviewLinkItem.get() : previewLinkItem.get(), [NSMenuItem separatorItem], readingListItem.get() ];
</del><ins>+ return @[ openLinkItem.get(), [NSMenuItem separatorItem], [NSMenuItem separatorItem], readingListItem.get() ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark mailto: and tel: Link actions
</span><span class="lines">@@ -721,26 +704,6 @@
</span><span class="cx"> return _webView.window;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark QLPreviewMenuItemDelegate implementation
-
-- (NSView *)menuItem:(NSMenuItem *)menuItem viewAtScreenPoint:(NSPoint)screenPoint
-{
- return _webView;
-}
-
-- (id<QLPreviewItem>)menuItem:(NSMenuItem *)menuItem previewItemAtPoint:(NSPoint)point
-{
- if (!_webView)
- return nil;
-
- return _hitTestResult.absoluteLinkURL();
-}
-
-- (NSRectEdge)menuItem:(NSMenuItem *)menuItem preferredEdgeForPoint:(NSPoint)point
-{
- return NSMaxYEdge;
-}
-
</del><span class="cx"> #pragma mark Menu Items
</span><span class="cx">
</span><span class="cx"> - (RetainPtr<NSMenuItem>)_createActionMenuItemForTag:(uint32_t)tag
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.h 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -37,9 +37,10 @@
</span><span class="cx"> WebView *_webView;
</span><span class="cx"> WebImmediateActionType _type;
</span><span class="cx"> WebCore::HitTestResult _hitTestResult;
</span><ins>+ NSImmediateActionGestureRecognizer *_immediateActionRecognizer;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (instancetype)initWithWebView:(WebView *)webView;
</del><ins>+- (instancetype)initWithWebView:(WebView *)webView recognizer:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
</ins><span class="cx"> - (void)webViewClosed;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -34,20 +34,29 @@
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import <WebCore/EventHandler.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><ins>+#import <WebCore/NSMenuSPI.h>
+#import <WebCore/SoftLinking.h>
</ins><span class="cx"> #import <objc/objc-class.h>
</span><span class="cx"> #import <objc/objc.h>
</span><span class="cx">
</span><ins>+SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, QuickLookUI)
+SOFT_LINK_CLASS(QuickLookUI, QLPreviewMenuItem)
+
+@interface WebImmediateActionController () <QLPreviewMenuItemDelegate>
+@end
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @implementation WebImmediateActionController
</span><span class="cx">
</span><del>-- (instancetype)initWithWebView:(WebView *)webView
</del><ins>+- (instancetype)initWithWebView:(WebView *)webView recognizer:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</ins><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> _webView = webView;
</span><span class="cx"> _type = WebImmediateActionNone;
</span><ins>+ _immediateActionRecognizer = immediateActionRecognizer;
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -55,6 +64,7 @@
</span><span class="cx"> - (void)webViewClosed
</span><span class="cx"> {
</span><span class="cx"> _webView = nil;
</span><ins>+ _immediateActionRecognizer = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_clearImmediateActionState
</span><span class="lines">@@ -77,17 +87,18 @@
</span><span class="cx"> if (!_webView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (immediateActionRecognizer.view != _webView)
</del><ins>+ if (immediateActionRecognizer != _immediateActionRecognizer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WebHTMLView *documentView = [[[_webView _selectedOrMainFrame] frameView] documentView];
</span><span class="cx"> NSPoint locationInDocumentView = [immediateActionRecognizer locationInView:documentView];
</span><span class="cx"> [self performHitTestAtPoint:locationInDocumentView];
</span><ins>+ [self _updateImmediateActionItem];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)immediateActionRecognizerWillBeginAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</span><span class="cx"> {
</span><del>- if (immediateActionRecognizer.view != _webView)
</del><ins>+ if (immediateActionRecognizer != _immediateActionRecognizer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Add support for the types of functionality provided in Action menu's menuNeedsUpdate.
</span><span class="lines">@@ -95,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)immediateActionRecognizerDidCancelAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</span><span class="cx"> {
</span><del>- if (immediateActionRecognizer.view != _webView)
</del><ins>+ if (immediateActionRecognizer != _immediateActionRecognizer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [self _clearImmediateActionState];
</span><span class="lines">@@ -103,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)immediateActionRecognizerDidCompleteAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</span><span class="cx"> {
</span><del>- if (immediateActionRecognizer.view != _webView)
</del><ins>+ if (immediateActionRecognizer != _immediateActionRecognizer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Add support for the types of functionality provided in Action menu's willOpenMenu.
</span><span class="lines">@@ -113,9 +124,42 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateImmediateActionItem
</span><span class="cx"> {
</span><del>- // FIXME: Implement. Inspect _hitTestResult to determine if there is an immediate action to take.
</del><ins>+ _type = WebImmediateActionNone;
+ _immediateActionRecognizer.animationController = nil;
+
+ NSURL *url = _hitTestResult.absoluteLinkURL();
+ NSString *absoluteURLString = [url absoluteString];
+ if (url && WebCore::protocolIsInHTTPFamily(absoluteURLString)) {
+ _type = WebImmediateActionLinkPreview;
+
+ RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem = [NSMenuItem standardQuickLookMenuItem];
+ [qlPreviewLinkItem setPreviewStyle:QLPreviewStylePopover];
+ [qlPreviewLinkItem setDelegate:self];
+ _immediateActionRecognizer.animationController = (id<NSImmediateActionAnimationController>)qlPreviewLinkItem.get();
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark QLPreviewMenuItemDelegate implementation
+
+- (NSView *)menuItem:(NSMenuItem *)menuItem viewAtScreenPoint:(NSPoint)screenPoint
+{
+ return _webView;
+}
+
+- (id<QLPreviewItem>)menuItem:(NSMenuItem *)menuItem previewItemAtPoint:(NSPoint)point
+{
+ if (!_webView)
+ return nil;
+
+ return _hitTestResult.absoluteLinkURL();
+}
+
+- (NSRectEdge)menuItem:(NSMenuItem *)menuItem preferredEdgeForPoint:(NSPoint)point
+{
+ return NSMaxYEdge;
+}
+
</ins><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="trunkSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -146,6 +146,7 @@
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> WebImmediateActionNone = 0,
</span><ins>+ WebImmediateActionLinkPreview
</ins><span class="cx"> } WebImmediateActionType;
</span><span class="cx">
</span><span class="cx"> // Message Sources.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -895,7 +895,7 @@
</span><span class="cx">
</span><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span><span class="cx"> RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
</span><del>- _private->immediateActionController = [[WebImmediateActionController alloc] initWithWebView:self];
</del><ins>+ _private->immediateActionController = [[WebImmediateActionController alloc] initWithWebView:self recognizer:recognizer.get()];
</ins><span class="cx"> [recognizer setDelegate:_private->immediateActionController];
</span><span class="cx"> [self addGestureRecognizer:recognizer.get()];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-12-11 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Move the preview popover to WebImmediateActionController
+ https://bugs.webkit.org/show_bug.cgi?id=139563
+ <rdar://problem/19208291>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/mac/WKImmediateActionController.h:
+ Remove an unnecessary forward declaration.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController willDestroyView:]):
+ Clear the immediate action recognizer when the view goes away.
+
+2014-12-11 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Fix the build.
</span><span class="cx">
</span><span class="cx"> * UIProcess/mac/WKImmediateActionController.h:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@class NSImmediateActionGestureRecognizer;
</del><span class="cx"> @class WKPagePreviewViewController;
</span><span class="cx"> @class WKView;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (177185 => 177186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-11 22:59:42 UTC (rev 177185)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-11 23:11:41 UTC (rev 177186)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> _page = nullptr;
</span><span class="cx"> _wkView = nil;
</span><span class="cx"> _hitTestResult = ActionMenuHitTestResult();
</span><ins>+ _immediateActionRecognizer = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_clearImmediateActionState
</span></span></pre>
</div>
</div>
</body>
</html>