Changeset 80381 in webkit
- Timestamp:
- Mar 4, 2011 3:09:26 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r80380 r80381 1 2011-03-04 Jessie Berlin <jberlin@apple.com> 2 3 Reviewed by Darin Adler. 4 5 WebKit2: Use CFNetwork Sessions API. 6 https://bugs.webkit.org/show_bug.cgi?id=55435. 7 8 Add in the CFURLSTORAGESESSIONS guards that I incorrectly left out because the code was 9 contained within guards that made USE(CFURLSTORAGESESSIONS) always be true. 10 11 * platform/network/cf/ResourceHandleCFNet.cpp: 12 (WebCore::makeFinalRequest): 13 (WebCore::ResourceHandle::willSendRequest): 14 * platform/network/cf/ResourceRequestCFNet.cpp: 15 * platform/network/mac/ResourceHandleMac.mm: 16 (WebCore::ResourceHandle::createNSURLConnection): 17 (WebCore::ResourceHandle::willSendRequest): 18 * platform/network/mac/ResourceRequestMac.mm: 19 1 20 2011-03-04 Yuqiang Xian <yuqiang.xian@intel.com> 2 21 -
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
r80294 r80381 336 336 CFMutableURLRequestRef newRequest = CFURLRequestCreateMutableCopy(kCFAllocatorDefault, request.cfURLRequest()); 337 337 338 #if USE(CFURLSTORAGESESSIONS) 338 339 if (CFURLStorageSessionRef storageSession = ResourceHandle::privateBrowsingStorageSession()) 339 340 wkSetRequestStorageSession(storageSession, newRequest); 341 #endif 340 342 341 343 if (!shouldContentSniff) … … 485 487 request.clearHTTPAuthorization(); 486 488 489 #if USE(CFURLSTORAGESESSIONS) 487 490 if (CFURLStorageSessionRef storageSession = privateBrowsingStorageSession()) 488 491 request.setStorageSession(storageSession); 492 #endif 489 493 490 494 client()->willSendRequest(this, request, redirectResponse); … … 723 727 } 724 728 729 #if USE(CFURLSTORAGESESSIONS) 730 725 731 RetainPtr<CFURLStorageSessionRef> ResourceHandle::createPrivateBrowsingStorageSession(CFStringRef identifier) 726 732 { … … 732 738 return String(reinterpret_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleIdentifierKey))); 733 739 } 740 741 #endif 734 742 735 743 void WebCoreSynchronousLoaderClient::willSendRequest(ResourceHandle* handle, ResourceRequest& request, const ResourceResponse& /*redirectResponse*/) -
trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
r80294 r80381 196 196 } 197 197 198 #if USE(CFURLSTORAGESESSIONS) 199 198 200 void ResourceRequest::setStorageSession(CFURLStorageSessionRef storageSession) 199 201 { … … 202 204 m_cfRequest.adoptCF(cfRequest); 203 205 } 206 207 #endif 204 208 205 209 #endif // USE(CFNETWORK) -
trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
r80294 r80381 240 240 #endif 241 241 242 #if USE(CFURLSTORAGESESSIONS) 242 243 if (CFURLStorageSessionRef storageSession = privateBrowsingStorageSession()) 243 244 nsRequest = [wkCopyRequestWithStorageSession(storageSession, nsRequest) autorelease]; 245 #endif 244 246 245 247 if (supportsSettingConnectionProperties) { … … 556 558 request.clearHTTPAuthorization(); 557 559 560 #if USE(CFURLSTORAGESESSIONS) 558 561 if (CFURLStorageSessionRef storageSession = privateBrowsingStorageSession()) 559 562 request.setStorageSession(storageSession); 563 #endif 560 564 561 565 client()->willSendRequest(this, request, redirectResponse); … … 700 704 } 701 705 706 #if USE(CFURLSTORAGESESSIONS) 707 702 708 RetainPtr<CFURLStorageSessionRef> ResourceHandle::createPrivateBrowsingStorageSession(CFStringRef identifier) 703 709 { … … 709 715 return String([[NSBundle mainBundle] bundleIdentifier]); 710 716 } 717 718 #endif 711 719 712 720 } // namespace WebCore -
trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm
r80294 r80381 175 175 } 176 176 177 #if USE(CFURLSTORAGESESSIONS) 178 177 179 void ResourceRequest::setStorageSession(CFURLStorageSessionRef storageSession) 178 180 { … … 180 182 } 181 183 184 #endif 185 182 186 } // namespace WebCore 183 187 -
trunk/Source/WebKit2/ChangeLog
r80370 r80381 1 2011-03-04 Jessie Berlin <jberlin@apple.com> 2 3 Reviewed by Darin Adler. 4 5 WebKit2: Use CFNetwork Sessions API. 6 https://bugs.webkit.org/show_bug.cgi?id=55435. 7 8 Add in the CFURLSTORAGESESSIONS guards that I incorrectly left out because the code was 9 contained within guards that made USE(CFURLSTORAGESESSIONS) always be true. 10 11 * UIProcess/mac/WebContextMac.mm: 12 (WebKit::WebContext::platformInitializeWebProcess): 13 * UIProcess/win/WebContextWin.cpp: 14 (WebKit::WebContext::platformInitializeWebProcess): 15 1 16 2011-03-04 Jessie Berlin <jberlin@apple.com> 2 17 -
trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm
r80180 r80381 95 95 parameters.uiProcessBundleResourcePath = fileSystemRepresentation([[NSBundle mainBundle] resourcePath]); 96 96 97 #if USE(CFURLSTORAGESESSIONS) 97 98 parameters.uiProcessBundleIdentifier = String([[NSBundle mainBundle] bundleIdentifier]); 99 #endif 98 100 } 99 101 -
trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp
r80180 r80381 70 70 parameters.cfURLCachePath.remove(parameters.cfURLCachePath.length() - 1); 71 71 72 #if USE(CFURLSTORAGESESSIONS) 72 73 parameters.uiProcessBundleIdentifier = String(reinterpret_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleIdentifierKey))); 73 #endif 74 #endif // USE(CFURLSTORAGESESSIONS) 75 76 #endif // USE(CFNETWORK) 74 77 } 75 78
Note: See TracChangeset
for help on using the changeset viewer.