Title: [232167] trunk
- Revision
- 232167
- Author
- commit-qu...@webkit.org
- Date
- 2018-05-24 16:39:09 -0700 (Thu, 24 May 2018)
Log Message
[iOS] Hard link AppSupport instead of soft linking
https://bugs.webkit.org/show_bug.cgi?id=185959
<rdar://problem/40506538>
Patch by Joseph Pecoraro <pecor...@apple.com> on 2018-05-24
Reviewed by Timothy Horton.
Source/WebCore:
* Configurations/WebCore.xcconfig:
* platform/network/ios/NetworkStateNotifierIOS.mm:
(-[WebNetworkStateObserver initWithBlock:]):
(WebCore::NetworkStateNotifier::updateStateWithoutNotifying):
WebKitLibraries:
* WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd:
* WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd:
Add stub for ObjC Class CPNetworkObserver.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (232166 => 232167)
--- trunk/Source/WebCore/ChangeLog 2018-05-24 22:06:39 UTC (rev 232166)
+++ trunk/Source/WebCore/ChangeLog 2018-05-24 23:39:09 UTC (rev 232167)
@@ -1,3 +1,16 @@
+2018-05-24 Joseph Pecoraro <pecor...@apple.com>
+
+ [iOS] Hard link AppSupport instead of soft linking
+ https://bugs.webkit.org/show_bug.cgi?id=185959
+ <rdar://problem/40506538>
+
+ Reviewed by Timothy Horton.
+
+ * Configurations/WebCore.xcconfig:
+ * platform/network/ios/NetworkStateNotifierIOS.mm:
+ (-[WebNetworkStateObserver initWithBlock:]):
+ (WebCore::NetworkStateNotifier::updateStateWithoutNotifying):
+
2018-05-24 Chris Dumez <cdu...@apple.com>
Cache navigator.userAgent for performance
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (232166 => 232167)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-05-24 22:06:39 UTC (rev 232166)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-05-24 23:39:09 UTC (rev 232167)
@@ -73,6 +73,9 @@
WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
+WK_APPSUPPORT_LDFLAGS = $(WK_APPSUPPORT_LDFLAGS_$(WK_COCOA_TOUCH));
+WK_APPSUPPORT_LDFLAGS_cocoatouch = -framework AppSupport;
+
WK_AUDIO_UNIT_LDFLAGS = $(WK_AUDIO_UNIT_LDFLAGS_$(WK_PLATFORM_NAME));
WK_AUDIO_UNIT_LDFLAGS_macosx = -framework AudioUnit;
@@ -125,7 +128,7 @@
WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting;
// FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI;
OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit;
Modified: trunk/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm (232166 => 232167)
--- trunk/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm 2018-05-24 22:06:39 UTC (rev 232166)
+++ trunk/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm 2018-05-24 23:39:09 UTC (rev 232167)
@@ -30,7 +30,6 @@
#import "DeprecatedGlobalSettings.h"
#import "WebCoreThreadRun.h"
-#import <wtf/SoftLinking.h>
#if USE(APPLE_INTERNAL_SDK)
#import <AppSupport/CPNetworkObserver.h>
@@ -42,9 +41,6 @@
@end
#endif
-SOFT_LINK_PRIVATE_FRAMEWORK(AppSupport);
-SOFT_LINK_CLASS(AppSupport, CPNetworkObserver);
-
@interface WebNetworkStateObserver : NSObject {
void (^block)();
}
@@ -57,7 +53,7 @@
{
if (!(self = [super init]))
return nil;
- [[getCPNetworkObserverClass() sharedNetworkObserver] addNetworkReachableObserver:self selector:@selector(networkStateChanged:)];
+ [[CPNetworkObserver sharedNetworkObserver] addNetworkReachableObserver:self selector:@selector(networkStateChanged:)];
block = [observerBlock copy];
return self;
}
@@ -80,7 +76,7 @@
void NetworkStateNotifier::updateStateWithoutNotifying()
{
- m_isOnLine = [[getCPNetworkObserverClass() sharedNetworkObserver] isNetworkReachable];
+ m_isOnLine = [[CPNetworkObserver sharedNetworkObserver] isNetworkReachable];
}
void NetworkStateNotifier::startObserving()
Modified: trunk/WebKitLibraries/ChangeLog (232166 => 232167)
--- trunk/WebKitLibraries/ChangeLog 2018-05-24 22:06:39 UTC (rev 232166)
+++ trunk/WebKitLibraries/ChangeLog 2018-05-24 23:39:09 UTC (rev 232167)
@@ -1,3 +1,15 @@
+2018-05-24 Joseph Pecoraro <pecor...@apple.com>
+
+ [iOS] Hard link AppSupport instead of soft linking
+ https://bugs.webkit.org/show_bug.cgi?id=185959
+ <rdar://problem/40506538>
+
+ Reviewed by Timothy Horton.
+
+ * WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd:
+ * WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd:
+ Add stub for ObjC Class CPNetworkObserver.
+
2018-03-17 Jiewen Tan <jiewen_...@apple.com>
[WebAuthN] Implement authenticatorMakeCredential
Modified: trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd (232166 => 232167)
--- trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd 2018-05-24 22:06:39 UTC (rev 232166)
+++ trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd 2018-05-24 23:39:09 UTC (rev 232167)
@@ -15,6 +15,8 @@
- x86_64
symbols:
- _CPCopyBundleIdentifierFromAuditToken
+ objc-classes:
+ - _CPNetworkObserver
install-name: /System/Library/PrivateFrameworks/AppSupport.framework/AppSupport
objc-constraint: none
platform: ios
Modified: trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd (232166 => 232167)
--- trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd 2018-05-24 22:06:39 UTC (rev 232166)
+++ trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd 2018-05-24 23:39:09 UTC (rev 232167)
@@ -15,6 +15,8 @@
- x86_64
symbols:
- _CPCopyBundleIdentifierFromAuditToken
+ objc-classes:
+ - _CPNetworkObserver
install-name: /System/Library/PrivateFrameworks/AppSupport.framework/AppSupport
objc-constraint: none
platform: ios
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
