[Win] Unreviewed build fix after r207218.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Oct 2016 17:22:55 +0000 (17:22 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Oct 2016 17:22:55 +0000 (17:22 +0000)
The CQ-landed patch used the old USE(CFNETWORK) compiler guard.
It should be using USE(CFURLCONNECTION).

* WebCache.cpp:
(WebCache::cacheFolder):
(WebCache::setCacheFolder):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@207223 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/win/ChangeLog
Source/WebKit/win/WebCache.cpp

index 0ded59e..df1c07e 100644 (file)
@@ -1,3 +1,14 @@
+2016-10-12  Brent Fulgham  <bfulgham@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  <pvollan@apple.com>
 
         [Win] Parallel DRTs are sharing preferences and cache.
index b2da9b4..be72f8a 100644 (file)
@@ -248,10 +248,12 @@ HRESULT WebCache::cacheFolder(__deref_out_opt BSTR* location)
     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,12 +263,14 @@ HRESULT WebCache::setCacheFolder(_In_ BSTR location)
     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());
     RetainPtr<CFURLCacheRef> newCache = adoptCF(CFURLCacheCreate(kCFAllocatorDefault, memoryCapacity, diskCapacity, String(location).createCFString().get()));
     CFURLCacheSetSharedURLCache(newCache.get());
     return S_OK;
+#else
+    return E_NOTIMPL;
 #endif
 }