<!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>[184471] branches/safari-601.1.32-branch/Source/WebKit2</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/184471">184471</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 07:21:37 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183978">r183978</a>. rdar://problem/20635659</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebKit2ChangeLog">branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessAPImacWKViewInternalh">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessmacPageClientImplmm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2UIProcessmacWKImmediateActionControllermm">branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184470 => 184471)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 13:54:28 UTC (rev 184470)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:21:37 UTC (rev 184471)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r183978. rdar://problem/20635659
+
+ 2015-05-07 Conrad Shultz <conrad_shultz@apple.com>
+
+ Don't register for Lookup notifications until needed
+ https://bugs.webkit.org/show_bug.cgi?id=144783
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/mac/WKView.mm:
+ Add a WKViewData ivar to track whether we've already registered for popover notifications.
+ (-[WKView _prepareForDictionaryLookup]):
+ Added; moved notification registration from -[WKView initWithFrame:processPool:configuration:webView:.
+ (-[WKView initWithFrame:processPool:configuration:webView:]):
+ Move notification registration to -_prepareForDictionaryLookup.
+
+ * UIProcess/API/mac/WKViewInternal.h:
+ Expose -_prepareForDictionaryLookup.
+
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::didPerformDictionaryLookup):
+ Send -[WKView _prepareForDictionaryLookup].
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _animationControllerForText]):
+ Ditto.
+
</ins><span class="cx"> 2015-05-13 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r183976.
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (184470 => 184471)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-18 13:54:28 UTC (rev 184470)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-05-18 14:21:37 UTC (rev 184471)
</span><span class="lines">@@ -280,6 +280,8 @@
</span><span class="cx">
</span><span class="cx"> CGFloat _overrideDeviceScaleFactor;
</span><span class="cx">
</span><ins>+ BOOL _didRegisterForLookupPopoverCloseNotifications;
+
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> BOOL _automaticallyAdjustsContentInsets;
</span><span class="cx"> RetainPtr<WKActionMenuController> _actionMenuController;
</span><span class="lines">@@ -2888,6 +2890,17 @@
</span><span class="cx"> _data->_page->viewStateDidChange(ViewState::IsVisible);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_prepareForDictionaryLookup
+{
+ if (_data->_didRegisterForLookupPopoverCloseNotifications)
+ return;
+
+ _data->_didRegisterForLookupPopoverCloseNotifications = YES;
+
+ if (canLoadLUNotificationPopoverWillClose())
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
+}
+
</ins><span class="cx"> - (void)_dictionaryLookupPopoverWillClose:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx"> [self _clearTextIndicatorWithAnimation:TextIndicatorDismissalAnimation::None];
</span><span class="lines">@@ -3832,9 +3845,6 @@
</span><span class="cx"> NSNotificationCenter* workspaceNotificationCenter = [[NSWorkspace sharedWorkspace] notificationCenter];
</span><span class="cx"> [workspaceNotificationCenter addObserver:self selector:@selector(_activeSpaceDidChange:) name:NSWorkspaceActiveSpaceDidChangeNotification object:nil];
</span><span class="cx">
</span><del>- if (canLoadLUNotificationPopoverWillClose())
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
-
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> if ([self respondsToSelector:@selector(_setActionMenu:)]) {
</span><span class="cx"> RetainPtr<NSMenu> menu = adoptNS([[NSMenu alloc] init]);
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (184470 => 184471)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-05-18 13:54:28 UTC (rev 184470)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-05-18 14:21:37 UTC (rev 184471)
</span><span class="lines">@@ -140,6 +140,8 @@
</span><span class="cx"> @property (readonly) WKFullScreenWindowController *_fullScreenWindowController;
</span><span class="cx"> - (void)_closeFullScreenWindowController;
</span><span class="cx">
</span><ins>+- (void)_prepareForDictionaryLookup;
+
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> - (void)_didPerformActionMenuHitTest:(const WebKit::WebHitTestResult::Data&)hitTestResult forImmediateAction:(BOOL)forImmediateAction contentPreventsDefault:(BOOL)contentPreventsDefault userData:(API::Object*)userData;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (184470 => 184471)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-05-18 13:54:28 UTC (rev 184470)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-05-18 14:21:37 UTC (rev 184471)
</span><span class="lines">@@ -593,6 +593,8 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([(NSDictionary *)dictionaryPopupInfo.options.get() mutableCopy]);
</span><span class="cx">
</span><ins>+ [m_wkView _prepareForDictionaryLookup];
+
</ins><span class="cx"> if (canLoadLUTermOptionDisableSearchTermIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
</span><span class="cx"> [m_wkView _setTextIndicator:*TextIndicator::create(dictionaryPopupInfo.textIndicator) withLifetime:TextIndicatorLifetime::Permanent];
</span><span class="cx"> [mutableOptions setObject:@YES forKey:getLUTermOptionDisableSearchTermIndicator()];
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (184470 => 184471)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-05-18 13:54:28 UTC (rev 184470)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-05-18 14:21:37 UTC (rev 184471)
</span><span class="lines">@@ -467,6 +467,8 @@
</span><span class="cx"> if (!dictionaryPopupInfo.attributedString.string)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><ins>+ [_wkView _prepareForDictionaryLookup];
+
</ins><span class="cx"> // Convert baseline to screen coordinates.
</span><span class="cx"> NSPoint textBaselineOrigin = dictionaryPopupInfo.origin;
</span><span class="cx"> textBaselineOrigin = [_wkView convertPoint:textBaselineOrigin toView:nil];
</span></span></pre>
</div>
</div>
</body>
</html>