Changeset 240621 in webkit

Timestamp:

Jan 28, 2019 4:58:13 PM (5 years ago)

Author:

ddkilzer@apple.com

Message:

Move soft-linking of ManagedConfiguration.framework out of ManagedConfigurationSPI.h
<​https://webkit.org/b/193868>

Reviewed by Daniel Bates.

• 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.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/ManagedConfigurationSPI.h (modified) (4 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (7 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-28  David Kilzer  <ddkilzer@apple.com>
+
+        Move soft-linking of ManagedConfiguration.framework out of ManagedConfigurationSPI.h
+        <https://webkit.org/b/193868>
+
+        Reviewed by Daniel Bates.
+
+        * 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-28  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/ManagedConfigurationSPI.h

@@ -1 +1 @@
 /*
- * 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
@@ -24 +24 @@
  */
 
-#import <Foundation/Foundation.h>
-#import <wtf/SoftLinking.h>
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
 
 #if USE(APPLE_INTERNAL_SDK)
@@ -39 +38 @@
 
 #else
+
+WTF_EXTERN_C_BEGIN
+
+extern NSString * const MCFeatureDefinitionLookupAllowed;
+
+WTF_EXTERN_C_END
 
 typedef enum MCRestrictedBoolType {
@@ -54 +59 @@
 #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)

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1 +1 @@
 /*
- * 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
@@ -34 +34 @@
 #import "InputViewUpdateDeferrer.h"
 #import "Logging.h"
-#import "ManagedConfigurationSPI.h"
 #import "NativeWebKeyboardEvent.h"
 #import "NativeWebTouchEvent.h"
@@ -103 +102 @@
 #import <wtf/RetainPtr.h>
 #import <wtf/SetForScope.h>
-#import <wtf/SoftLinking.h>
 #import <wtf/WeakObjCPtr.h>
 #import <wtf/cocoa/NSURLExtras.h>
@@ -133 +131 @@
 #import "RemoteScrollingCoordinatorProxy.h"
 #import <WebCore/TouchAction.h>
+#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
 
@@ -2673 +2680 @@
 
 #if !PLATFORM(IOSMAC)
-        if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)
+        if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo)
             return NO;
 #endif
@@ -2685 +2692 @@
 
 #if !PLATFORM(IOSMAC)
-        if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)
+        if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo)
             return NO;
 #endif
@@ -2834 +2841 @@
 {
 #if !PLATFORM(IOSMAC)
-    if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)
+    if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:getMCFeatureDefinitionLookupAllowed()] == MCRestrictedBoolExplicitNo)
         return;
 #endif