Title: [149651] trunk/Source/WebKit2
- Revision
- 149651
- Author
- beid...@apple.com
- Date
- 2013-05-06 17:05:12 -0700 (Mon, 06 May 2013)
Log Message
Remove some unnecessary soft linking in NetworkProcess.
<rdar://problem/13821779> and https://bugs.webkit.org/show_bug.cgi?id=115683
Reviewed by Sam Weinig.
Replace some unneeded soft linking with forward declarations.
* NetworkProcess/mac/DiskCacheMonitor.mm:
(WebKit::DiskCacheMonitor::DiskCacheMonitor):
* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::tryGetShareableHandleFromCFURLCachedResponse):
(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149650 => 149651)
--- trunk/Source/WebKit2/ChangeLog 2013-05-06 23:55:15 UTC (rev 149650)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-07 00:05:12 UTC (rev 149651)
@@ -1,3 +1,18 @@
+2013-05-06 Brady Eidson <beid...@apple.com>
+
+ Remove some unnecessary soft linking in NetworkProcess.
+ <rdar://problem/13821779> and https://bugs.webkit.org/show_bug.cgi?id=115683
+
+ Reviewed by Sam Weinig.
+
+ Replace some unneeded soft linking with forward declarations.
+
+ * NetworkProcess/mac/DiskCacheMonitor.mm:
+ (WebKit::DiskCacheMonitor::DiskCacheMonitor):
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+ (WebKit::NetworkResourceLoader::tryGetShareableHandleFromCFURLCachedResponse):
+ (WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
+
2013-05-06 Anders Carlsson <ander...@apple.com>
More work on LocalStorageDatabaseTracker
Modified: trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm (149650 => 149651)
--- trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2013-05-06 23:55:15 UTC (rev 149650)
+++ trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2013-05-07 00:05:12 UTC (rev 149651)
@@ -30,20 +30,11 @@
#import "NetworkProcessConnectionMessages.h"
#import "NetworkResourceLoader.h"
#import "WebCoreArgumentCoders.h"
-#import <WebCore/SoftLinking.h>
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-SOFT_LINK_FRAMEWORK(CFNetwork)
-
typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
-static void CFCachedURLResponseSetBecameFileBackedCallBackBlock(CFCachedURLResponseRef response, CFCachedURLResponseCallBackBlock callback, dispatch_queue_t queue)
-{
- typedef void (*SetCallbackFunctionType)(CFCachedURLResponseRef, CFCachedURLResponseCallBackBlock, dispatch_queue_t);
- static SetCallbackFunctionType softResponseSetBecameFileBackedCallBackBlock = (SetCallbackFunctionType) dlsym(CFNetworkLibrary(), "_CFCachedURLResponseSetBecameFileBackedCallBackBlock");
- if (softResponseSetBecameFileBackedCallBackBlock)
- return softResponseSetBecameFileBackedCallBackBlock(response, callback, queue);
-}
+extern "C" void _CFCachedURLResponseSetBecameFileBackedCallBackBlock(CFCachedURLResponseRef, CFCachedURLResponseCallBackBlock, dispatch_queue_t);
using namespace WebCore;
@@ -94,7 +85,7 @@
monitor->send(Messages::NetworkProcessConnection::DidCacheResource(monitor->resourceRequest(), handle));
};
- CFCachedURLResponseSetBecameFileBackedCallBackBlock(cachedResponse, block, dispatch_get_main_queue());
+ _CFCachedURLResponseSetBecameFileBackedCallBackBlock(cachedResponse, block, dispatch_get_main_queue());
}
CoreIPC::Connection* DiskCacheMonitor::connection() const
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (149650 => 149651)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-05-06 23:55:15 UTC (rev 149650)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-05-07 00:05:12 UTC (rev 149651)
@@ -30,7 +30,6 @@
#import "ShareableResource.h"
#import <WebCore/ResourceHandle.h>
#import <WebCore/SharedBuffer.h>
-#import <WebCore/SoftLinking.h>
using namespace WebCore;
@@ -39,27 +38,8 @@
typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
extern "C" CFURLCacheRef CFURLCacheCopySharedURLCache();
extern "C" CFCachedURLResponseRef CFURLCacheCopyResponseForRequest(CFURLCacheRef, CFURLRequestRef);
-
-SOFT_LINK_FRAMEWORK(CFNetwork)
-static CFDataRef CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef response)
-{
- typedef CFDataRef (*functionType)(CFCachedURLResponseRef);
- static functionType softGetMemMappedData = (functionType) dlsym(CFNetworkLibrary(), "_CFCachedURLResponseGetMemMappedData");
-
- if (softGetMemMappedData)
- return softGetMemMappedData(response);
- return NULL;
-}
-
-static bool CFURLCacheIsMemMappedData(CFURLCacheRef cache, CFDataRef data)
-{
- typedef CFBooleanRef (*functionType)(CFURLCacheRef cache, CFDataRef data);
- static functionType softLinkIsCacheMMAPedData = (functionType) dlsym(CFNetworkLibrary(), "_CFURLCacheIsResponseDataMemMapped");
-
- if (softLinkIsCacheMMAPedData)
- return softLinkIsCacheMMAPedData(cache, data) == kCFBooleanTrue;
- return false;
-}
+extern "C" CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
+extern "C" bool _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
#endif
@interface NSCachedURLResponse (NSCachedURLResponseDetails)
@@ -88,7 +68,7 @@
void NetworkResourceLoader::tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle& handle, CFCachedURLResponseRef cachedResponse)
{
- CFDataRef data = ""
+ CFDataRef data = ""
tryGetShareableHandleFromCFData(handle, data);
}
@@ -100,7 +80,7 @@
return;
RetainPtr<CFDataRef> data = ""
- if (!CFURLCacheIsMemMappedData(cache.get(), data.get()))
+ if (!_CFURLCacheIsResponseDataMemMapped(cache.get(), data.get()))
return;
tryGetShareableHandleFromCFData(handle, data.get());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
