<!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>[179261] branches/safari-600.5-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/179261">179261</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 10:00:51 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/179014">r179014</a>. rdar://problem/19573674</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformspimacQuickLookMacSPIh">branches/safari-600.5-branch/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacChangeLog">branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacWebViewWebHTMLViewmm">branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacWebViewWebImmediateActionControllerh">branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacWebViewWebImmediateActionControllermm">branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2ChangeLog">branches/safari-600.5-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessmacWKImmediateActionControllerh">branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessmacWKImmediateActionControllermm">branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-28 Matthew <matthew_hanson@apple.com>
+
+ Merge r179014. rdar://problem/19573674
+
+ 2015-01-23 Timothy Horton <timothy_horton@apple.com>
+
+ QLPreviewMenuItem popovers don't close when the page scrolls
+ https://bugs.webkit.org/show_bug.cgi?id=140806
+ <rdar://problem/19555618>
+
+ Reviewed by Beth Dakin.
+
+ * platform/spi/mac/QuickLookMacSPI.h:
+ Add some SPI.
+
</ins><span class="cx"> 2015-01-23 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merged r176354. <rdar://problem/19451336>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformspimacQuickLookMacSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebCore/platform/spi/mac/QuickLookMacSPI.h 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx"> QLPreviewStylePopover
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+- (void)close;
+
</ins><span class="cx"> @property (assign) id<QLPreviewMenuItemDelegate> delegate;
</span><span class="cx"> @property QLPreviewStyle previewStyle;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-01-28 Matthew <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179014. rdar://problem/19573674
+
+ 2015-01-23 Timothy Horton <timothy_horton@apple.com>
+
+ QLPreviewMenuItem popovers don't close when the page scrolls
+ https://bugs.webkit.org/show_bug.cgi?id=140806
+ <rdar://problem/19555618>
+
+ Reviewed by Beth Dakin.
+
+ Now that QLPreviewMenuItem's popover doesn't eat scrolls, we need to dismiss it if the page scrolls.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView scrollWheel:scrollWheel:]):
+ Send scrollWheel along to WebImmediateActionController.
+
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController webView:didHandleScrollWheel:]):
+ (-[WebImmediateActionController _clearImmediateActionState]):
+ (-[WebImmediateActionController _defaultAnimationController]):
+ Keep track of the active QLPreviewMenuItem, and close it upon scroll.
+
+2015-01-28 Matthew <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r179013. rdar://problem/19571601
</span><span class="cx">
</span><span class="cx"> 2015-01-23 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -3778,6 +3778,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> [[[self _webView] _actionMenuController] webView:[self _webView] didHandleScrollWheel:event];
</span><ins>+ [[[self _webView] _immediateActionController] webView:[self _webView] didHandleScrollWheel:event];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKitmacWebViewWebImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @class DDActionContext;
</span><ins>+@class QLPreviewMenuItem;
</ins><span class="cx"> @class WebView;
</span><span class="cx">
</span><span class="cx"> @interface WebImmediateActionController : NSObject <NSImmediateActionGestureRecognizerDelegate> {
</span><span class="lines">@@ -40,6 +41,7 @@
</span><span class="cx"> WebCore::HitTestResult _hitTestResult;
</span><span class="cx"> RetainPtr<NSImmediateActionGestureRecognizer> _immediateActionRecognizer;
</span><span class="cx">
</span><ins>+ RetainPtr<QLPreviewMenuItem> _currentQLPreviewMenuItem;
</ins><span class="cx"> RetainPtr<DDActionContext> _currentActionContext;
</span><span class="cx"> BOOL _isShowingTextIndicator;
</span><span class="cx"> BOOL _hasActivatedActionContext;
</span><span class="lines">@@ -49,6 +51,7 @@
</span><span class="cx"> - (void)webViewClosed;
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)webView willHandleMouseDown:(NSEvent *)event;
</span><ins>+- (void)webView:(WebView *)webView didHandleScrollWheel:(NSEvent *)event;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -98,6 +98,12 @@
</span><span class="cx"> [self _clearImmediateActionState];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)webView:(WebView *)webView didHandleScrollWheel:(NSEvent *)event
+{
+ [_currentQLPreviewMenuItem close];
+ [self _clearImmediateActionState];
+}
+
</ins><span class="cx"> - (void)_cancelImmediateAction
</span><span class="cx"> {
</span><span class="cx"> // Reset the recognizer by turning it off and on again.
</span><span class="lines">@@ -121,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> _type = WebImmediateActionNone;
</span><span class="cx"> _currentActionContext = nil;
</span><ins>+ _currentQLPreviewMenuItem = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)performHitTestAtPoint:(NSPoint)viewPoint
</span><span class="lines">@@ -211,6 +218,7 @@
</span><span class="cx"> RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem = [NSMenuItem standardQuickLookMenuItem];
</span><span class="cx"> [qlPreviewLinkItem setPreviewStyle:QLPreviewStylePopover];
</span><span class="cx"> [qlPreviewLinkItem setDelegate:self];
</span><ins>+ _currentQLPreviewMenuItem = qlPreviewLinkItem.get();
</ins><span class="cx"> return (id <NSImmediateActionAnimationController>)qlPreviewLinkItem.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-01-28 Matthew <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179014. rdar://problem/19573674
+
+ 2015-01-23 Timothy Horton <timothy_horton@apple.com>
+
+ QLPreviewMenuItem popovers don't close when the page scrolls
+ https://bugs.webkit.org/show_bug.cgi?id=140806
+ <rdar://problem/19555618>
+
+ Reviewed by Beth Dakin.
+
+ Now that QLPreviewMenuItem's popover doesn't eat scrolls, we need to dismiss it if the page scrolls.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _dismissContentRelativeChildWindows]):
+ Send _dismissContentRelativeChildWindows on to WKImmediateActionController.
+
+ * UIProcess/mac/WKImmediateActionController.h:
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _clearImmediateActionState]):
+ (-[WKImmediateActionController dismissContentRelativeChildWindows]):
+ (-[WKImmediateActionController _defaultAnimationController]):
+ Keep track of the active QLPreviewMenuItem, and close it upon scroll.
+
+2015-01-28 Matthew <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r179013. rdar://problem/19571601
</span><span class="cx">
</span><span class="cx"> 2015-01-23 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -4342,6 +4342,8 @@
</span><span class="cx">
</span><span class="cx"> [self _setTextIndicator:nullptr fadeOut:NO];
</span><span class="cx">
</span><ins>+ [_data->_immediateActionController dismissContentRelativeChildWindows];
+
</ins><span class="cx"> static_cast<PageClient&>(*_data->_pageClient).dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcessmacWKImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @class DDActionContext;
</span><ins>+@class QLPreviewMenuItem;
</ins><span class="cx"> @class WKView;
</span><span class="cx">
</span><span class="cx"> @interface WKImmediateActionController : NSObject <NSImmediateActionGestureRecognizerDelegate> {
</span><span class="lines">@@ -60,12 +61,14 @@
</span><span class="cx">
</span><span class="cx"> BOOL _hasActivatedActionContext;
</span><span class="cx"> RetainPtr<DDActionContext> _currentActionContext;
</span><ins>+ RetainPtr<QLPreviewMenuItem> _currentQLPreviewMenuItem;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(WKView *)wkView recognizer:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
</span><span class="cx"> - (void)willDestroyView:(WKView *)view;
</span><span class="cx"> - (void)didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData;
</span><span class="cx"> - (void)wkView:(WKView *)wkView willHandleMouseDown:(NSEvent *)event;
</span><ins>+- (void)dismissContentRelativeChildWindows;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179260 => 179261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-28 17:59:50 UTC (rev 179260)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-28 18:00:51 UTC (rev 179261)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> _type = kWKImmediateActionNone;
</span><span class="cx"> _currentActionContext = nil;
</span><span class="cx"> _userData = nil;
</span><ins>+ _currentQLPreviewMenuItem = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didPerformActionMenuHitTest:(const ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData
</span><span class="lines">@@ -139,6 +140,11 @@
</span><span class="cx"> [self _cancelImmediateActionIfNeeded];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)dismissContentRelativeChildWindows
+{
+ [_currentQLPreviewMenuItem close];
+}
+
</ins><span class="cx"> #pragma mark NSImmediateActionGestureRecognizerDelegate
</span><span class="cx">
</span><span class="cx"> - (void)immediateActionRecognizerWillPrepare:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</span><span class="lines">@@ -237,6 +243,7 @@
</span><span class="cx"> RetainPtr<QLPreviewMenuItem> qlPreviewLinkItem = [NSMenuItem standardQuickLookMenuItem];
</span><span class="cx"> [qlPreviewLinkItem setPreviewStyle:QLPreviewStylePopover];
</span><span class="cx"> [qlPreviewLinkItem setDelegate:self];
</span><ins>+ _currentQLPreviewMenuItem = qlPreviewLinkItem.get();
</ins><span class="cx"> return (id<NSImmediateActionAnimationController>)qlPreviewLinkItem.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>