Attachment 341226 Details for Bug 185959 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

link-2.patch (text/plain), 7.25 KB, created by Joseph Pecoraro on 2018-05-24 14:41:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2018-05-24 14:41:38 PDT

Size: 7.25 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f617f329396..d29a7c13759 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-24  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        [iOS] Hard link AppSupport instead of soft linking
>+        https://bugs.webkit.org/show_bug.cgi?id=185959
>+        <rdar://problem/40506538>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/WebCore.xcconfig:
>+        * platform/network/ios/NetworkStateNotifierIOS.mm:
>+        (-[WebNetworkStateObserver initWithBlock:]):
>+        (WebCore::NetworkStateNotifier::updateStateWithoutNotifying):
>+
> 2018-05-23  Keith Miller  <keith_miller@apple.com>
> 
>         Expose $vm if window.internals is exposed
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index 252af49e477..8eb91d91699 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -73,6 +73,9 @@ WK_LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWO
> 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 = $(WK_URL_FORMATTING_LDFLAGS_$(WK_HAVE_URL_FORMATTING
> 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;
>diff --git a/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm b/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm
>index c027bc4cc3d..5e8c600fc81 100644
>--- a/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm
>+++ b/Source/WebCore/platform/network/ios/NetworkStateNotifierIOS.mm
>@@ -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 @@ - (BOOL)isNetworkReachable;
> @end
> #endif
> 
>-SOFT_LINK_PRIVATE_FRAMEWORK(AppSupport);
>-SOFT_LINK_CLASS(AppSupport, CPNetworkObserver);
>-
> @interface WebNetworkStateObserver : NSObject {
>     void (^block)();
> }
>@@ -57,7 +53,7 @@ - (id)initWithBlock:(void (^)())observerBlock
> {
>     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 @@ namespace WebCore {
> 
> void NetworkStateNotifier::updateStateWithoutNotifying()
> {
>-    m_isOnLine = [[getCPNetworkObserverClass() sharedNetworkObserver] isNetworkReachable];
>+    m_isOnLine = [[CPNetworkObserver sharedNetworkObserver] isNetworkReachable];
> }
> 
> void NetworkStateNotifier::startObserving()
>diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
>index 493a6256ab7..3b56cd156c2 100644
>--- a/WebKitLibraries/ChangeLog
>+++ b/WebKitLibraries/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-24  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        [iOS] Hard link AppSupport instead of soft linking
>+        https://bugs.webkit.org/show_bug.cgi?id=185959
>+        <rdar://problem/40506538>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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_tan@apple.com>
> 
>         [WebAuthN] Implement authenticatorMakeCredential
>diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd
>index 44579874ce3..34a69e918b0 100644
>--- a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd
>+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd
>@@ -15,6 +15,8 @@ exports:
>       - x86_64
>     symbols:
>       - _CPCopyBundleIdentifierFromAuditToken
>+    objc-classes:
>+      - CPNetworkObserver
> install-name: /System/Library/PrivateFrameworks/AppSupport.framework/AppSupport
> objc-constraint: none
> platform: ios
>diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd
>index 44579874ce3..34a69e918b0 100644
>--- a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd
>+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd
>@@ -15,6 +15,8 @@ exports:
>       - x86_64
>     symbols:
>       - _CPCopyBundleIdentifierFromAuditToken
>+    objc-classes:
>+      - CPNetworkObserver
> install-name: /System/Library/PrivateFrameworks/AppSupport.framework/AppSupport
> objc-constraint: none
> platform: ios

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185959: 341223 | 341226 | 341228