⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 176284 in webkit


Ignore:
Timestamp:
Nov 18, 2014, 2:10:57 PM (12 years ago)
Author:
dburkart@apple.com
Message:

Merge r176166. rdar://problem/18953982

Location:
branches/safari-600.3-branch/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-600.3-branch/Source/WebCore/ChangeLog

    r176281 r176284  
     12014-11-18  Dana Burkart  <dburkart@apple.com>
     2
     3        Merge r176166. rdar://problem/18953982
     4
     5    2014-11-16  Tim Horton  <timothy_horton@apple.com>
     6
     7            Use TextIndicator instead of the built in Lookup highlight
     8            https://bugs.webkit.org/show_bug.cgi?id=138775
     9            <rdar://problem/18953982>
     10
     11            Follow-up to r176164.
     12
     13            * platform/spi/mac/LookupSPI.h:
     14            (WebCore::canDisableLookupIndicator): Deleted.
     15            Remove canDisableLookupIndicator.
     16
    1172014-11-18  Dana Burkart  <dburkart@apple.com>
    218

  • branches/safari-600.3-branch/Source/WebCore/platform/mac/SoftLinking.h

    r165676 r176284  
    111111    }
    112112
    113 #if PLATFORM(IOS)
    114113#define SOFT_LINK_MAY_FAIL(framework, functionName, resultType, parameterDeclarations, parameterNames) \
    115114    static resultType (*softLink##functionName) parameterDeclarations = 0; \
    … …  
    133132        return softLink##functionName parameterNames; \
    134133    }
    135 #endif
    136134
    137135/* callingConvention is unused on Mac but is here to keep the macro prototype the same between Mac and Windows. */
    … …  
    239237    }
    240238
    241 #if PLATFORM(IOS)
    242239#define SOFT_LINK_CONSTANT_MAY_FAIL(framework, name, type) \
    243240    static bool init##name(); \
    … …  
    266263        return true; \
    267264    }
    268 #endif

  • branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/LookupSPI.h

    r176281 r176284  
    3232SOFT_LINK_CLASS_OPTIONAL(Lookup, LULookupDefinitionModule)
    3333
    34 SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUTermOptionDisableSearchTermIndicator, NSString *)
    35 SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
    36 
    37 namespace WebCore {
    38 inline bool canDisableLookupIndicator()
    39 {
    40     return canLoadLUTermOptionDisableSearchTermIndicator() && canLoadLUNotificationPopoverWillClose();
    41 }
    42 };
    43 
    4434#if USE(APPLE_INTERNAL_SDK)
    4535

  • branches/safari-600.3-branch/Source/WebKit2/ChangeLog

    r176281 r176284  
     12014-11-18  Dana Burkart  <dburkart@apple.com>
     2
     3        Merge r176166. rdar://problem/18953982
     4
     5    2014-11-16  Tim Horton  <timothy_horton@apple.com>
     6
     7            Use TextIndicator instead of the built in Lookup highlight
     8            https://bugs.webkit.org/show_bug.cgi?id=138775
     9            <rdar://problem/18953982>
     10
     11            Follow-up to r176164.
     12
     13            * UIProcess/API/mac/WKView.mm:
     14            (-[WKView dealloc]):
     15            (-[WKView initWithFrame:context:configuration:webView:]):
     16            * UIProcess/mac/PageClientImpl.mm:
     17            (WebKit::PageClientImpl::didPerformDictionaryLookup):
     18            Include the softlinking macros directly in the files they're used
     19            in, as they're supposed to be used.
     20
    1212014-11-18  Dana Burkart  <dburkart@apple.com>
    222

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r176281 r176284  
    143143};
    144144
     145SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
     146
    145147using namespace WebKit;
    146148using namespace WebCore;
    … …  
    327329    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillTerminateNotification object:NSApp];
    328330
    329     if (canDisableLookupIndicator())
     331    if (canLoadLUNotificationPopoverWillClose())
    330332        [[NSNotificationCenter defaultCenter] removeObserver:self name:getLUNotificationPopoverWillClose() object:nil];
    331333
    … …  
    35753577    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:NSApp];
    35763578
    3577     if (canDisableLookupIndicator())
     3579    if (canLoadLUNotificationPopoverWillClose())
    35783580        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
    35793581

  • branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

    r176281 r176284  
    8181#endif
    8282
     83SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUTermOptionDisableSearchTermIndicator, NSString *)
     84
    8385using namespace WebCore;
    8486using namespace WebKit;
    … …  
    544546    RetainPtr<NSMutableDictionary> mutableOptions = adoptNS([(NSDictionary *)dictionaryPopupInfo.options.get() mutableCopy]);
    545547
    546     if (canDisableLookupIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
     548    if (canLoadLUTermOptionDisableSearchTermIndicator() && dictionaryPopupInfo.textIndicator.contentImage) {
    547549        // Run the animations serially because attaching another subwindow breaks the bounce animation.
    548550        // We could consider making the bounce NSAnimationNonblockingThreaded instead, which seems
Note: See TracChangeset for help on using the changeset viewer.