Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176283 => 176284)
--- 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)
@@ -1,5 +1,21 @@
2014-11-18 Dana Burkart <[email protected]>
+ Merge r176166. rdar://problem/18953982
+
+ 2014-11-16 Tim Horton <[email protected]>
+
+ 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 <[email protected]>
+
Merge r176164. rdar://problem/18953982
2014-11-16 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/platform/mac/SoftLinking.h (176283 => 176284)
--- 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)
@@ -110,7 +110,6 @@
return softLink##functionName parameterNames; \
}
-#if PLATFORM(IOS)
#define SOFT_LINK_MAY_FAIL(framework, functionName, resultType, parameterDeclarations, parameterNames) \
static resultType (*softLink##functionName) parameterDeclarations = 0; \
\
@@ -132,7 +131,6 @@
ASSERT(softLink##functionName); \
return softLink##functionName parameterNames; \
}
-#endif
/* callingConvention is unused on Mac but is here to keep the macro prototype the same between Mac and Windows. */
#define SOFT_LINK_OPTIONAL(framework, functionName, resultType, callingConvention, parameterDeclarations) \
@@ -238,7 +236,6 @@
return constant##name; \
}
-#if PLATFORM(IOS)
#define SOFT_LINK_CONSTANT_MAY_FAIL(framework, name, type) \
static bool init##name(); \
static type (*get##name)() = 0; \
@@ -265,4 +262,3 @@
get##name = name##Function; \
return true; \
}
-#endif
Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h (176283 => 176284)
--- 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)
@@ -31,16 +31,6 @@
SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Lookup)
SOFT_LINK_CLASS_OPTIONAL(Lookup, LULookupDefinitionModule)
-SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUTermOptionDisableSearchTermIndicator, NSString *)
-SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
-
-namespace WebCore {
-inline bool canDisableLookupIndicator()
-{
- return canLoadLUTermOptionDisableSearchTermIndicator() && canLoadLUNotificationPopoverWillClose();
-}
-};
-
#if USE(APPLE_INTERNAL_SDK)
#import <Lookup/Lookup.h>
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176283 => 176284)
--- 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)
@@ -1,5 +1,25 @@
2014-11-18 Dana Burkart <[email protected]>
+ Merge r176166. rdar://problem/18953982
+
+ 2014-11-16 Tim Horton <[email protected]>
+
+ 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 <[email protected]>
+
Merge r176164. rdar://problem/18953982
2014-11-16 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (176283 => 176284)
--- 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)
@@ -142,6 +142,8 @@
CGError CGSGetScreenRectForWindow(CGSConnectionID cid, CGSWindowID wid, CGRect *rect);
};
+SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
+
using namespace WebKit;
using namespace WebCore;
@@ -326,7 +328,7 @@
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillTerminateNotification object:NSApp];
- if (canDisableLookupIndicator())
+ if (canLoadLUNotificationPopoverWillClose())
[[NSNotificationCenter defaultCenter] removeObserver:self name:getLUNotificationPopoverWillClose() object:nil];
WebContext::statistics().wkViewCount--;
@@ -3574,7 +3576,7 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:NSApp];
- if (canDisableLookupIndicator())
+ if (canLoadLUNotificationPopoverWillClose())
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (176283 => 176284)
--- 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)
@@ -80,6 +80,8 @@
@end
#endif
+SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUTermOptionDisableSearchTermIndicator, NSString *)
+
using namespace WebCore;
using namespace WebKit;
@@ -543,7 +545,7 @@
RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([(NSDictionary *)dictionaryPopupInfo.options.get() mutableCopy]);
- if (canDisableLookupIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
+ if (canLoadLUTermOptionDisableSearchTermIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
// Run the animations serially because attaching another subwindow breaks the bounce animation.
// We could consider making the bounce NSAnimationNonblockingThreaded instead, which seems
// to work, but need to consider all of the implications.
