Changeset 219016 in webkit

Timestamp:

Jun 30, 2017, 2:52:53 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Stop soft linking with CFNetwork
​https://bugs.webkit.org/show_bug.cgi?id=174029

Reviewed by Jer Noble.

Source/WebCore:

We link directly with CFNetwork. There's no reason to soft link,
and it is causing a problem with linking when doing interesting things with CFNetwork.

• platform/spi/cf/CFNetworkSPI.h:

Source/WebKit2:

• Shared/mac/CookieStorageShim.mm:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/cf/CFNetworkSPI.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/mac/CookieStorageShim.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-06-30  Alex Christensen  <achristensen@webkit.org>
+
+        Stop soft linking with CFNetwork
+        https://bugs.webkit.org/show_bug.cgi?id=174029
+
+        Reviewed by Jer Noble.
+
+        We link directly with CFNetwork.  There's no reason to soft link, 
+        and it is causing a problem with linking when doing interesting things with CFNetwork.
+
+        * platform/spi/cf/CFNetworkSPI.h:
+
 2017-06-30  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

@@ -221 +221 @@
 SInt64 CFURLResponseGetExpectedContentLength(CFURLResponseRef);
 CFTypeID CFURLResponseGetTypeID();
+Boolean CFURLRequestShouldHandleHTTPCookies(CFURLRequestRef);
+CFURLRef CFURLRequestGetURL(CFURLRequestRef);
 CFURLResponseRef CFURLResponseCreate(CFAllocatorRef, CFURLRef, CFStringRef mimeType, SInt64 expectedContentLength, CFStringRef textEncodingName, CFURLCacheStoragePolicy);
 void CFURLResponseSetExpectedContentLength(CFURLResponseRef, SInt64 length);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-30  Alex Christensen  <achristensen@webkit.org>
+
+        Stop soft linking with CFNetwork
+        https://bugs.webkit.org/show_bug.cgi?id=174029
+
+        Reviewed by Jer Noble.
+
+        * Shared/mac/CookieStorageShim.mm:
+
 2017-06-30  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm

@@ -32 +32 @@
 #include "WebCoreArgumentCoders.h"
 #include "WebProcess.h"
+#include <WebCore/CFNetworkSPI.h>
 #include <WebCore/SessionID.h>
 #include <WebCore/SoftLinking.h>
@@ -43 +44 @@
 typedef const struct _CFURLRequest* CFURLRequestRef;
 @class NSURLSessionTask;
-
-SOFT_LINK_FRAMEWORK(CFNetwork)
-SOFT_LINK(CFNetwork, CFURLRequestGetURL, CFURLRef, (CFURLRequestRef request), (request))
-SOFT_LINK(CFNetwork, CFURLRequestShouldHandleHTTPCookies, Boolean, (CFURLRequestRef request), (request))
 
 using namespace WebCore;