Changeset 85070 in webkit

Timestamp:

Apr 27, 2011 11:52:09 AM (13 years ago)

Author:

psolanki@apple.com

Message:

Part of WebCore should use CFNetwork-based loader on Mac
​https://bugs.webkit.org/show_bug.cgi?id=51836

Reviewed by Antti Koivisto.

• Configurations/WebCore.xcconfig: Add location of CFNetwork.framework.
• platform/mac/SoftLinking.h:
• platform/network/cf/CookieJarCFNet.cpp: Soft-link in CFNetwork functions on Mac.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebCore.xcconfig (modified) (1 diff)
• platform/mac/SoftLinking.h (modified) (2 diffs)
• platform/network/cf/CookieJarCFNet.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-27  Pratik Solanki  <psolanki@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        Part of WebCore should use CFNetwork-based loader on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=51836
+
+        * Configurations/WebCore.xcconfig: Add location of CFNetwork.framework.
+        * platform/mac/SoftLinking.h:
+        * platform/network/cf/CookieJarCFNet.cpp: Soft-link in CFNetwork functions on Mac.
+
 2011-04-27  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/Configurations/WebCore.xcconfig

@@ -42 +42 @@
 FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
 FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS);
+FRAMEWORK_SEARCH_PATHS_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS);
 
 HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 $(SQLITE3_HEADER_SEARCH_PATHS) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);

trunk/Source/WebCore/platform/mac/SoftLinking.h

@@ -46 +46 @@
     }
 
+#define SOFT_LINK_FRAMEWORK_IN_CORESERVICES_UMBRELLA(framework) \
+    static void* framework##Library() \
+    { \
+        static void* frameworkLibrary = dlopen("/System/Library/Frameworks/CoreServices.framework/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
+        ASSERT(frameworkLibrary); \
+        return frameworkLibrary; \
+    }
+
 #define SOFT_LINK(framework, functionName, resultType, parameterDeclarations, parameterNames) \
     static resultType init##functionName parameterDeclarations; \
@@ -60 +68 @@
     {\
         return softLink##functionName parameterNames; \
+    }
+
+/* callingConvention is unused on Mac but is here to keep the macro prototype the same between Mac and Windows. */
+#define SOFT_LINK_OPTIONAL(framework, functionName, resultType, callingConvention, parameterDeclarations) \
+    typedef resultType (*functionName##PtrType) parameterDeclarations; \
+    \
+    static functionName##PtrType functionName##Ptr() \
+    { \
+        static functionName##PtrType ptr = reinterpret_cast<functionName##PtrType>(dlsym(framework##Library(), #functionName)); \
+        return ptr; \
     }
 

trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp

@@ -38 +38 @@
 #include <CFNetwork/CFHTTPCookiesPriv.h>
 #include <CoreFoundation/CoreFoundation.h>
+
+#if PLATFORM(WIN)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <windows.h>
+#endif
 
 namespace WebCore {
@@ -46 +49 @@
 static const CFStringRef s_cookieCF = CFSTR("Cookie");
 
+#if PLATFORM(WIN)
 #ifdef DEBUG_ALL
 SOFT_LINK_DEBUG_LIBRARY(CFNetwork)
 #else
 SOFT_LINK_LIBRARY(CFNetwork)
+#endif
+#else
+SOFT_LINK_FRAMEWORK_IN_CORESERVICES_UMBRELLA(CFNetwork)
 #endif