Title: [207223] trunk/Source/WebKit/win
- Revision
- 207223
- Author
- bfulg...@apple.com
- Date
- 2016-10-12 10:22:55 -0700 (Wed, 12 Oct 2016)
Log Message
[Win] Unreviewed build fix after r207218.
The CQ-landed patch used the old USE(CFNETWORK) compiler guard.
It should be using USE(CFURLCONNECTION).
* WebCache.cpp:
(WebCache::cacheFolder):
(WebCache::setCacheFolder):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (207222 => 207223)
--- trunk/Source/WebKit/win/ChangeLog 2016-10-12 16:56:34 UTC (rev 207222)
+++ trunk/Source/WebKit/win/ChangeLog 2016-10-12 17:22:55 UTC (rev 207223)
@@ -1,3 +1,14 @@
+2016-10-12 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Unreviewed build fix after r207218.
+
+ The CQ-landed patch used the old USE(CFNETWORK) compiler guard.
+ It should be using USE(CFURLCONNECTION).
+
+ * WebCache.cpp:
+ (WebCache::cacheFolder):
+ (WebCache::setCacheFolder):
+
2016-10-12 Per Arne Vollan <pvol...@apple.com>
[Win] Parallel DRTs are sharing preferences and cache.
Modified: trunk/Source/WebKit/win/WebCache.cpp (207222 => 207223)
--- trunk/Source/WebKit/win/WebCache.cpp 2016-10-12 16:56:34 UTC (rev 207222)
+++ trunk/Source/WebKit/win/WebCache.cpp 2016-10-12 17:22:55 UTC (rev 207223)
@@ -248,10 +248,12 @@
String cacheFolder = WebCore::CurlCacheManager::getInstance().cacheDirectory();
*location = WebCore::BString(cacheFolder).release();
return S_OK;
-#elif USE(CFNETWORK)
+#elif USE(CFURLCONNECTION)
RetainPtr<CFStringRef> cfurlCacheDirectory = adoptCF(wkCopyFoundationCacheDirectory(0));
*location = BString(cfurlCacheDirectory.get()).release();
return S_OK;
+#else
+ return E_NOTIMPL;
#endif
}
@@ -261,7 +263,7 @@
String cacheFolder(location, SysStringLen(location));
WebCore::CurlCacheManager::getInstance().setCacheDirectory(cacheFolder);
return S_OK;
-#elif USE(CFNETWORK)
+#elif USE(CFURLCONNECTION)
RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
CFIndex memoryCapacity = CFURLCacheMemoryCapacity(cache.get());
CFIndex diskCapacity = CFURLCacheDiskCapacity(cache.get());
@@ -268,5 +270,7 @@
RetainPtr<CFURLCacheRef> newCache = adoptCF(CFURLCacheCreate(kCFAllocatorDefault, memoryCapacity, diskCapacity, String(location).createCFString().get()));
CFURLCacheSetSharedURLCache(newCache.get());
return S_OK;
+#else
+ return E_NOTIMPL;
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
