Changeset 207223 in webkit


Ignore:
Timestamp:
Oct 12, 2016 10:22:55 AM (7 years ago)
Author:
Brent Fulgham
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):

Location:
trunk/Source/WebKit/win
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/win/ChangeLog

    r207218 r207223  
     12016-10-12  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Unreviewed build fix after r207218.
     4
     5        The CQ-landed patch used the old USE(CFNETWORK) compiler guard.
     6        It should be using USE(CFURLCONNECTION).
     7
     8        * WebCache.cpp:
     9        (WebCache::cacheFolder):
     10        (WebCache::setCacheFolder):
     11
    1122016-10-12  Per Arne Vollan  <pvollan@apple.com>
    213
  • trunk/Source/WebKit/win/WebCache.cpp

    r207218 r207223  
    249249    *location = WebCore::BString(cacheFolder).release();
    250250    return S_OK;
    251 #elif USE(CFNETWORK)
     251#elif USE(CFURLCONNECTION)
    252252    RetainPtr<CFStringRef> cfurlCacheDirectory = adoptCF(wkCopyFoundationCacheDirectory(0));
    253253    *location = BString(cfurlCacheDirectory.get()).release();
    254254    return S_OK;
     255#else
     256    return E_NOTIMPL;
    255257#endif
    256258}
     
    262264    WebCore::CurlCacheManager::getInstance().setCacheDirectory(cacheFolder);
    263265    return S_OK;
    264 #elif USE(CFNETWORK)
     266#elif USE(CFURLCONNECTION)
    265267    RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
    266268    CFIndex memoryCapacity = CFURLCacheMemoryCapacity(cache.get());
     
    269271    CFURLCacheSetSharedURLCache(newCache.get());
    270272    return S_OK;
    271 #endif
    272 }
     273#else
     274    return E_NOTIMPL;
     275#endif
     276}
Note: See TracChangeset for help on using the changeset viewer.