Changeset 176166 in webkit

Timestamp:

Nov 16, 2014, 5:57:26 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

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.

• platform/spi/mac/LookupSPI.h:

(WebCore::canDisableLookupIndicator): Deleted.
Remove canDisableLookupIndicator.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/mac/LookupSPI.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/mac/WKView.mm (modified) (3 diffs)
• WebKit2/UIProcess/mac/PageClientImpl.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/spi/mac/LookupSPI.h

@@ -32 +32 @@
 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)
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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-16  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -143 +143 @@
 };
 
+SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
+
 using namespace WebKit;
 using namespace WebCore;
@@ -327 +329 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillTerminateNotification object:NSApp];
 
-    if (canDisableLookupIndicator())
+    if (canLoadLUNotificationPopoverWillClose())
         [[NSNotificationCenter defaultCenter] removeObserver:self name:getLUNotificationPopoverWillClose() object:nil];
 
@@ -3575 +3577 @@
     [[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];
 

trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

@@ -81 +81 @@
 #endif
 
+SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUTermOptionDisableSearchTermIndicator, NSString *)
+
 using namespace WebCore;
 using namespace WebKit;
@@ -544 +546 @@
     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