Changeset 240621 in webkit
- Timestamp:
- Jan 28, 2019 4:58:13 PM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r240620 r240621 1 2019-01-28 David Kilzer <ddkilzer@apple.com> 2 3 Move soft-linking of ManagedConfiguration.framework out of ManagedConfigurationSPI.h 4 <https://webkit.org/b/193868> 5 6 Reviewed by Daniel Bates. 7 8 * Platform/spi/ios/ManagedConfigurationSPI.h: 9 - Remove soft-linking code from header. 10 - Add PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC) guard. 11 12 * UIProcess/ios/WKContentViewInteraction.mm: 13 (-[WKContentView canPerformActionForWebView:withSender:]): 14 (-[WKContentView _defineForWebView:]): 15 - Add soft-linking code formerly in ManagedConfigurationSPI.h. 16 - Change MCFeatureDefinitionLookupAllowed to use soft-link 17 function getMCFeatureDefinitionLookupAllowed() to remove the 18 #define. 19 1 20 2019-01-28 Per Arne Vollan <pvollan@apple.com> 2 21 -
trunk/Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h
r219191 r240621 1 1 /* 2 * Copyright (C) 2014-201 6Apple Inc. All rights reserved.2 * Copyright (C) 2014-2019 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 #import <Foundation/Foundation.h> 27 #import <wtf/SoftLinking.h> 26 #if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC) 28 27 29 28 #if USE(APPLE_INTERNAL_SDK) … … 39 38 40 39 #else 40 41 WTF_EXTERN_C_BEGIN 42 43 extern NSString * const MCFeatureDefinitionLookupAllowed; 44 45 WTF_EXTERN_C_END 41 46 42 47 typedef enum MCRestrictedBoolType { … … 54 59 #endif 55 60 56 WTF_EXTERN_C_BEGIN 57 58 extern NSString * const MCFeatureDefinitionLookupAllowed; 59 60 WTF_EXTERN_C_END 61 62 SOFT_LINK_PRIVATE_FRAMEWORK(ManagedConfiguration); 63 SOFT_LINK_CLASS(ManagedConfiguration, MCProfileConnection); 64 SOFT_LINK_CONSTANT(ManagedConfiguration, MCFeatureDefinitionLookupAllowed, NSString *) 65 66 #define MCFeatureDefinitionLookupAllowed getMCFeatureDefinitionLookupAllowed() 61 #endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC) -
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
r240587 r240621 1 1 /* 2 * Copyright (C) 2012-201 8Apple Inc. All rights reserved.2 * Copyright (C) 2012-2019 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 34 34 #import "InputViewUpdateDeferrer.h" 35 35 #import "Logging.h" 36 #import "ManagedConfigurationSPI.h"37 36 #import "NativeWebKeyboardEvent.h" 38 37 #import "NativeWebTouchEvent.h" … … 103 102 #import <wtf/RetainPtr.h> 104 103 #import <wtf/SetForScope.h> 105 #import <wtf/SoftLinking.h>106 104 #import <wtf/WeakObjCPtr.h> 107 105 #import <wtf/cocoa/NSURLExtras.h> … … 133 131 #import "RemoteScrollingCoordinatorProxy.h" 134 132 #import <WebCore/TouchAction.h> 133 #endif 134 135 #if !PLATFORM(IOSMAC) 136 #import "ManagedConfigurationSPI.h" 137 #import <wtf/SoftLinking.h> 138 139 SOFT_LINK_PRIVATE_FRAMEWORK(ManagedConfiguration); 140 SOFT_LINK_CLASS(ManagedConfiguration, MCProfileConnection); 141 SOFT_LINK_CONSTANT(ManagedConfiguration, MCFeatureDefinitionLookupAllowed, NSString *) 135 142 #endif 136 143 … … 2673 2680 2674 2681 #if !PLATFORM(IOSMAC) 2675 if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting: MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)2682 if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo) 2676 2683 return NO; 2677 2684 #endif … … 2685 2692 2686 2693 #if !PLATFORM(IOSMAC) 2687 if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting: MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)2694 if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo) 2688 2695 return NO; 2689 2696 #endif … … 2834 2841 { 2835 2842 #if !PLATFORM(IOSMAC) 2836 if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting: MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)2843 if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo) 2837 2844 return; 2838 2845 #endif
Note: See TracChangeset
for help on using the changeset viewer.