Title: [149678] trunk/Source/WebKit2
- Revision
- 149678
- Author
- [email protected]
- Date
- 2013-05-07 10:10:26 -0700 (Tue, 07 May 2013)
Log Message
Remove some unnecessary soft linking in NetworkProcess. (Take 2)
<rdar://problem/13821779> and https://bugs.webkit.org/show_bug.cgi?id=115683
Reviewed by Dean Jackson and owned by Andreas Kling.
As a followup to r149651, include the private headers conditionally.
Also, fix a bug introduced with r149651 (bool vs CFBooleanRef).
* NetworkProcess/mac/DiskCacheMonitor.mm:
* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149677 => 149678)
--- trunk/Source/WebKit2/ChangeLog 2013-05-07 16:54:52 UTC (rev 149677)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-07 17:10:26 UTC (rev 149678)
@@ -1,3 +1,17 @@
+2013-05-07 Brady Eidson <[email protected]>
+
+ Remove some unnecessary soft linking in NetworkProcess. (Take 2)
+ <rdar://problem/13821779> and https://bugs.webkit.org/show_bug.cgi?id=115683
+
+ Reviewed by Dean Jackson and owned by Andreas Kling.
+
+ As a followup to r149651, include the private headers conditionally.
+ Also, fix a bug introduced with r149651 (bool vs CFBooleanRef).
+
+ * NetworkProcess/mac/DiskCacheMonitor.mm:
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+ (WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
+
2013-05-07 Jinwoo Song <[email protected]>
[EFL][WK2] Add ewk APIs for setting and getting user agent
Modified: trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm (149677 => 149678)
--- trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2013-05-07 16:54:52 UTC (rev 149677)
+++ trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2013-05-07 17:10:26 UTC (rev 149678)
@@ -31,6 +31,12 @@
#import "NetworkResourceLoader.h"
#import "WebCoreArgumentCoders.h"
+#ifdef __has_include
+#if __has_include(<CFNetwork/CFURLCachePriv.h>)
+#include <CFNetwork/CFURLCachePriv.h>
+#endif
+#endif
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (149677 => 149678)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-05-07 16:54:52 UTC (rev 149677)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-05-07 17:10:26 UTC (rev 149678)
@@ -33,13 +33,22 @@
using namespace WebCore;
+#ifdef __has_include
+#if __has_include(<CFNetwork/CFURLCache.h>)
+#include <CFNetwork/CFURLCache.h>
+#endif
+#if __has_include(<CFNetwork/CFURLCachePriv.h>)
+#include <CFNetwork/CFURLCachePriv.h>
+#endif
+#endif
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
typedef const struct _CFURLCache* CFURLCacheRef;
typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
extern "C" CFURLCacheRef CFURLCacheCopySharedURLCache();
extern "C" CFCachedURLResponseRef CFURLCacheCopyResponseForRequest(CFURLCacheRef, CFURLRequestRef);
extern "C" CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
-extern "C" bool _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
+extern "C" CFBooleanRef _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
#endif
@interface NSCachedURLResponse (NSCachedURLResponseDetails)
@@ -80,7 +89,7 @@
return;
RetainPtr<CFDataRef> data = ""
- if (!_CFURLCacheIsResponseDataMemMapped(cache.get(), data.get()))
+ if (_CFURLCacheIsResponseDataMemMapped(cache.get(), data.get()) == kCFBooleanFalse)
return;
tryGetShareableHandleFromCFData(handle, data.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
