<!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>[176284] 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/176284">176284</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-18 14:10:57 -0800 (Tue, 18 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176166">r176166</a>. rdar://problem/18953982</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformmacSoftLinkingh">branches/safari-600.3-branch/Source/WebCore/platform/mac/SoftLinking.h</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformspimacLookupSPIh">branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacPageClientImplmm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.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 (176283 => 176284)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-18 22:10:09 UTC (rev 176283)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-18 22:10:57 UTC (rev 176284)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-11-18 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176166. rdar://problem/18953982
+
+ 2014-11-16 Tim Horton <timothy_horton@apple.com>
+
+ Use TextIndicator instead of the built in Lookup highlight
+ https://bugs.webkit.org/show_bug.cgi?id=138775
+ <rdar://problem/18953982>
+
+ Follow-up to r176164.
+
+ * platform/spi/mac/LookupSPI.h:
+ (WebCore::canDisableLookupIndicator): Deleted.
+ Remove canDisableLookupIndicator.
+
+2014-11-18 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176164. rdar://problem/18953982
</span><span class="cx">
</span><span class="cx"> 2014-11-16 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformmacSoftLinkingh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/mac/SoftLinking.h (176283 => 176284)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/mac/SoftLinking.h 2014-11-18 22:10:09 UTC (rev 176283)
+++ branches/safari-600.3-branch/Source/WebCore/platform/mac/SoftLinking.h 2014-11-18 22:10:57 UTC (rev 176284)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx"> return softLink##functionName parameterNames; \
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> #define SOFT_LINK_MAY_FAIL(framework, functionName, resultType, parameterDeclarations, parameterNames) \
</span><span class="cx"> static resultType (*softLink##functionName) parameterDeclarations = 0; \
</span><span class="cx"> \
</span><span class="lines">@@ -132,7 +131,6 @@
</span><span class="cx"> ASSERT(softLink##functionName); \
</span><span class="cx"> return softLink##functionName parameterNames; \
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> /* callingConvention is unused on Mac but is here to keep the macro prototype the same between Mac and Windows. */
</span><span class="cx"> #define SOFT_LINK_OPTIONAL(framework, functionName, resultType, callingConvention, parameterDeclarations) \
</span><span class="lines">@@ -238,7 +236,6 @@
</span><span class="cx"> return constant##name; \
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> #define SOFT_LINK_CONSTANT_MAY_FAIL(framework, name, type) \
</span><span class="cx"> static bool init##name(); \
</span><span class="cx"> static type (*get##name)() = 0; \
</span><span class="lines">@@ -265,4 +262,3 @@
</span><span class="cx"> get##name = name##Function; \
</span><span class="cx"> return true; \
</span><span class="cx"> }
</span><del>-#endif
</del></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformspimacLookupSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h (176283 => 176284)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h 2014-11-18 22:10:09 UTC (rev 176283)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h 2014-11-18 22:10:57 UTC (rev 176284)
</span><span class="lines">@@ -31,16 +31,6 @@
</span><span class="cx"> SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Lookup)
</span><span class="cx"> SOFT_LINK_CLASS_OPTIONAL(Lookup, LULookupDefinitionModule)
</span><span class="cx">
</span><del>-SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUTermOptionDisableSearchTermIndicator, NSString *)
-SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
-
-namespace WebCore {
-inline bool canDisableLookupIndicator()
-{
- return canLoadLUTermOptionDisableSearchTermIndicator() && canLoadLUNotificationPopoverWillClose();
-}
-};
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #import <Lookup/Lookup.h>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176283 => 176284)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-18 22:10:09 UTC (rev 176283)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-18 22:10:57 UTC (rev 176284)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-11-18 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176166. rdar://problem/18953982
+
+ 2014-11-16 Tim Horton <timothy_horton@apple.com>
+
+ Use TextIndicator instead of the built in Lookup highlight
+ https://bugs.webkit.org/show_bug.cgi?id=138775
+ <rdar://problem/18953982>
+
+ Follow-up to r176164.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView dealloc]):
+ (-[WKView initWithFrame:context:configuration:webView:]):
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::didPerformDictionaryLookup):
+ Include the softlinking macros directly in the files they're used
+ in, as they're supposed to be used.
+
+2014-11-18 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176164. rdar://problem/18953982
</span><span class="cx">
</span><span class="cx"> 2014-11-16 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (176283 => 176284)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-18 22:10:09 UTC (rev 176283)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-18 22:10:57 UTC (rev 176284)
</span><span class="lines">@@ -142,6 +142,8 @@
</span><span class="cx"> CGError CGSGetScreenRectForWindow(CGSConnectionID cid, CGSWindowID wid, CGRect *rect);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
+
</ins><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -326,7 +328,7 @@
</span><span class="cx">
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillTerminateNotification object:NSApp];
</span><span class="cx">
</span><del>- if (canDisableLookupIndicator())
</del><ins>+ if (canLoadLUNotificationPopoverWillClose())
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:getLUNotificationPopoverWillClose() object:nil];
</span><span class="cx">
</span><span class="cx"> WebContext::statistics().wkViewCount--;
</span><span class="lines">@@ -3574,7 +3576,7 @@
</span><span class="cx">
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:NSApp];
</span><span class="cx">
</span><del>- if (canDisableLookupIndicator())
</del><ins>+ if (canLoadLUNotificationPopoverWillClose())
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (176283 => 176284)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-11-18 22:10:09 UTC (rev 176283)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-11-18 22:10:57 UTC (rev 176284)
</span><span class="lines">@@ -80,6 +80,8 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUTermOptionDisableSearchTermIndicator, NSString *)
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -543,7 +545,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([(NSDictionary *)dictionaryPopupInfo.options.get() mutableCopy]);
</span><span class="cx">
</span><del>- if (canDisableLookupIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
</del><ins>+ if (canLoadLUTermOptionDisableSearchTermIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
</ins><span class="cx"> // Run the animations serially because attaching another subwindow breaks the bounce animation.
</span><span class="cx"> // We could consider making the bounce NSAnimationNonblockingThreaded instead, which seems
</span><span class="cx"> // to work, but need to consider all of the implications.
</span></span></pre>
</div>
</div>
</body>
</html>