<!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>[177342] branches/safari-600.3-branch/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/177342">177342</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-16 00:18:09 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177183">r177183</a>. <rdar://problem/19208291></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformspimacNSImmediateActionGestureRecognizerSPIh">branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacChangeLog">branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebImmediateActionControllerh">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebImmediateActionControllermm">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllerh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (177341 => 177342)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog        2014-12-16 08:17:58 UTC (rev 177341)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog        2014-12-16 08:18:09 UTC (rev 177342)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-12-16 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merged r177183. <rdar://problem/19208291>
+
+ 2014-12-11 Timothy Horton <timothy_horton@apple.com>
+
+ Fix the build.
+
+ * platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h:
+
+2014-12-16 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merged r177182. <rdar://problem/19208291>
</span><span class="cx">
</span><span class="cx"> 2014-12-11 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformspimacNSImmediateActionGestureRecognizerSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h (177341 => 177342)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h        2014-12-16 08:17:58 UTC (rev 177341)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h        2014-12-16 08:18:09 UTC (rev 177342)
</span><span class="lines">@@ -27,14 +27,21 @@
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSGestureRecognizer.h>
</span><span class="cx">
</span><del>-#if __has_include(<AppKit/NSImmediateActionGestureRecognizer_Private.h>)
</del><ins>+// FIXME: This header should include system headers when possible.
</ins><span class="cx">
</span><del>-#import <AppKit/NSImmediateActionGestureRecognizer_Private.h>
</del><ins>+@class NSImmediateActionGestureRecognizer;
</ins><span class="cx">
</span><del>-#else
</del><ins>+@protocol NSImmediateActionGestureRecognizerDelegate <NSGestureRecognizerDelegate>
+@optional
</ins><span class="cx">
</span><del>-@class NSImmediateActionGestureRecognizer;
</del><ins>+- (void)immediateActionRecognizerWillPrepare:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
+- (void)immediateActionRecognizerWillBeginAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
+- (void)immediateActionRecognizerDidUpdateAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
+- (void)immediateActionRecognizerDidCancelAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
+- (void)immediateActionRecognizerDidCompleteAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
</ins><span class="cx">
</span><ins>+@end
+
</ins><span class="cx"> @protocol NSImmediateActionAnimationController <NSObject>
</span><span class="cx"> @optional
</span><span class="cx">
</span><span class="lines">@@ -51,6 +58,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // __has_include(<AppKit/NSImmediateActionGestureRecognizer.h>)
-
</del><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (177341 => 177342)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog        2014-12-16 08:17:58 UTC (rev 177341)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog        2014-12-16 08:18:09 UTC (rev 177342)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-12-16 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merged r177183. <rdar://problem/19208291>
+
+ 2014-12-11 Timothy Horton <timothy_horton@apple.com>
+
+ Fix the build.
+
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+
+2014-12-16 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merged r177131. <rdar://problem/19198539>
</span><span class="cx">
</span><span class="cx"> 2014-12-10 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h (177341 => 177342)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h        2014-12-16 08:17:58 UTC (rev 177341)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h        2014-12-16 08:18:09 UTC (rev 177342)
</span><span class="lines">@@ -27,11 +27,12 @@
</span><span class="cx">
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="cx"> #import <WebCore/HitTestResult.h>
</span><ins>+#import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @class WebView;
</span><span class="cx">
</span><del>-@interface WebImmediateActionController : NSObject <NSGestureRecognizerDelegate> {
</del><ins>+@interface WebImmediateActionController : NSObject <NSImmediateActionGestureRecognizerDelegate> {
</ins><span class="cx"> @private
</span><span class="cx"> WebView *_webView;
</span><span class="cx"> WebImmediateActionType _type;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (177341 => 177342)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm        2014-12-16 08:17:58 UTC (rev 177341)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm        2014-12-16 08:18:09 UTC (rev 177342)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import <WebCore/EventHandler.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><del>-#import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
</del><span class="cx"> #import <objc/objc-class.h>
</span><span class="cx"> #import <objc/objc.h>
</span><span class="cx">
</span><span class="lines">@@ -71,7 +70,7 @@
</span><span class="cx"> _hitTestResult = coreFrame->eventHandler().hitTestResultAtPoint(IntPoint(viewPoint));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark NSGestureRecognizerDelegate
</del><ins>+#pragma mark NSImmediateActionGestureRecognizerDelegate
</ins><span class="cx">
</span><span class="cx"> - (void)immediateActionRecognizerWillPrepare:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177341 => 177342)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog        2014-12-16 08:17:58 UTC (rev 177341)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog        2014-12-16 08:18:09 UTC (rev 177342)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-12-16 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merged r177183. <rdar://problem/19208291>
+
+ 2014-12-11 Timothy Horton <timothy_horton@apple.com>
+
+ Fix the build.
+
+ * UIProcess/mac/WKImmediateActionController.h:
+ * UIProcess/mac/WKImmediateActionController.mm:
+
+2014-12-16 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merged r177180. <rdar://problem/19208291>
</span><span class="cx">
</span><span class="cx"> 2014-12-11 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h (177341 => 177342)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h        2014-12-16 08:17:58 UTC (rev 177341)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h        2014-12-16 08:18:09 UTC (rev 177342)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "ActionMenuHitTestResult.h"
</span><span class="cx"> #import "WKImmediateActionTypes.h"
</span><ins>+#import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -47,7 +48,7 @@
</span><span class="cx"> @class WKPagePreviewViewController;
</span><span class="cx"> @class WKView;
</span><span class="cx">
</span><del>-@interface WKImmediateActionController : NSObject <NSGestureRecognizerDelegate> {
</del><ins>+@interface WKImmediateActionController : NSObject <NSImmediateActionGestureRecognizerDelegate> {
</ins><span class="cx"> @private
</span><span class="cx"> WebKit::WebPageProxy *_page;
</span><span class="cx"> WKView *_wkView;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (177341 => 177342)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm        2014-12-16 08:17:58 UTC (rev 177341)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm        2014-12-16 08:18:09 UTC (rev 177342)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #import "WebPageProxyMessages.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import <WebCore/GeometryUtilities.h>
</span><del>-#import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
</del><span class="cx"> #import <WebCore/NSMenuSPI.h>
</span><span class="cx"> #import <WebCore/QuickLookMacSPI.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="lines">@@ -96,7 +95,7 @@
</span><span class="cx"> [self _updateImmediateActionItem];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark NSGestureRecognizerDelegate
</del><ins>+#pragma mark NSImmediateActionGestureRecognizerDelegate
</ins><span class="cx">
</span><span class="cx"> - (void)immediateActionRecognizerWillPrepare:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>