WebKit Bugzilla
Attachment 360241 Details for
Bug 193868
: Move soft-linking of ManagedConfiguration.framework out of ManagedConfigurationSPI.h
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch v1
bug-193868-20190126084052.patch (text/plain), 5.80 KB, created by
David Kilzer (:ddkilzer)
on 2019-01-26 08:40:53 PST
(
hide
)
Description:
Patch v1
Filename:
MIME Type:
Creator:
David Kilzer (:ddkilzer)
Created:
2019-01-26 08:40:53 PST
Size:
5.80 KB
patch
obsolete
>Subversion Revision: 240485 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index dcc7feb90a198ce37dc2f772d8483be537e1013c..b3c1406bc440524e3480624ea944f2be21e0c420 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,22 @@ >+2019-01-26 David Kilzer <ddkilzer@apple.com> >+ >+ Move soft-linking of ManagedConfiguration.framework out of ManagedConfigurationSPI.h >+ <https://webkit.org/b/193868> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Platform/spi/ios/ManagedConfigurationSPI.h: >+ - Remove soft-linking code from header. >+ - Add PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC) guard. >+ >+ * UIProcess/ios/WKContentViewInteraction.mm: >+ (-[WKContentView canPerformActionForWebView:withSender:]): >+ (-[WKContentView _defineForWebView:]): >+ - Add soft-linking code formerly in ManagedConfigurationSPI.h. >+ - Change MCFeatureDefinitionLookupAllowed to use soft-link >+ function getMCFeatureDefinitionLookupAllowed() to remove the >+ #define. >+ > 2019-01-26 David Kilzer <ddkilzer@apple.com> > > Move soft-linking of TelephonyUtilities.framework out of TUCallSPI.h >diff --git a/Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h b/Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h >index 98baa27ce7c73192e433ccc9793af4b739e3bce1..b17d8681d47d76b724cc7c60c4ec9e65d6e77a92 100644 >--- a/Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h >+++ b/Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2014-2016 Apple Inc. All rights reserved. >+ * Copyright (C) 2014-2019 Apple Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions >@@ -23,8 +23,7 @@ > * THE POSSIBILITY OF SUCH DAMAGE. > */ > >-#import <Foundation/Foundation.h> >-#import <wtf/SoftLinking.h> >+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC) > > #if USE(APPLE_INTERNAL_SDK) > >@@ -39,6 +38,12 @@ WTF_EXTERN_C_END > > #else > >+WTF_EXTERN_C_BEGIN >+ >+extern NSString * const MCFeatureDefinitionLookupAllowed; >+ >+WTF_EXTERN_C_END >+ > typedef enum MCRestrictedBoolType { > MCRestrictedBoolExplicitNo = 1 << 1, > } MCRestrictedBoolType; >@@ -53,14 +58,4 @@ typedef enum MCRestrictedBoolType { > > #endif > >-WTF_EXTERN_C_BEGIN >- >-extern NSString * const MCFeatureDefinitionLookupAllowed; >- >-WTF_EXTERN_C_END >- >-SOFT_LINK_PRIVATE_FRAMEWORK(ManagedConfiguration); >-SOFT_LINK_CLASS(ManagedConfiguration, MCProfileConnection); >-SOFT_LINK_CONSTANT(ManagedConfiguration, MCFeatureDefinitionLookupAllowed, NSString *) >- >-#define MCFeatureDefinitionLookupAllowed getMCFeatureDefinitionLookupAllowed() >+#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC) >diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm >index b28f177ca1485f75e14cccf158284c2962b4b791..a9ba7a8048e055fb1060775fbdc58b94c9fa39a1 100644 >--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm >+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2012-2018 Apple Inc. All rights reserved. >+ * Copyright (C) 2012-2019 Apple Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions >@@ -33,7 +33,6 @@ > #import "EditingRange.h" > #import "InputViewUpdateDeferrer.h" > #import "Logging.h" >-#import "ManagedConfigurationSPI.h" > #import "NativeWebKeyboardEvent.h" > #import "NativeWebTouchEvent.h" > #import "RemoteLayerTreeDrawingAreaProxy.h" >@@ -102,7 +101,6 @@ > #import <wtf/Optional.h> > #import <wtf/RetainPtr.h> > #import <wtf/SetForScope.h> >-#import <wtf/SoftLinking.h> > #import <wtf/WeakObjCPtr.h> > #import <wtf/cocoa/NSURLExtras.h> > #import <wtf/text/TextStream.h> >@@ -129,6 +127,15 @@ > #import <WebKitAdditions/WKPlatformFileUploadPanel.mm> > #endif > >+#if !PLATFORM(IOSMAC) >+#import "ManagedConfigurationSPI.h" >+#import <wtf/SoftLinking.h> >+ >+SOFT_LINK_PRIVATE_FRAMEWORK(ManagedConfiguration); >+SOFT_LINK_CLASS(ManagedConfiguration, MCProfileConnection); >+SOFT_LINK_CONSTANT(ManagedConfiguration, MCFeatureDefinitionLookupAllowed, NSString *) >+#endif >+ > #if PLATFORM(WATCHOS) > > @interface WKContentView (WatchSupport) <WKFocusedFormControlViewDelegate, WKSelectMenuListViewControllerDelegate, WKTextInputListViewControllerDelegate> >@@ -2604,7 +2611,7 @@ - (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender > return NO; > > #if !PLATFORM(IOSMAC) >- if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo) >+ if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo) > return NO; > #endif > >@@ -2616,7 +2623,7 @@ - (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender > return NO; > > #if !PLATFORM(IOSMAC) >- if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo) >+ if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo) > return NO; > #endif > >@@ -2765,7 +2772,7 @@ - (void)_showDictionary:(NSString *)text > - (void)_defineForWebView:(id)sender > { > #if !PLATFORM(IOSMAC) >- if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo) >+ if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo) > return; > #endif >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193868
: 360241