Changeset 146177 in webkit
- Timestamp:
- Mar 18, 2013 9:15:53 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r146175 r146177 1 2013-03-18 David Kilzer <ddkilzer@apple.com> 2 3 BUILD FIX (r146088): ResourceRequest::cfURLRequest() is defined twice on iOS 4 <http://webkit.org/b/112387> 5 6 * platform/network/mac/ResourceRequestMac.mm: 7 (WebCore::ResourceRequest::cfURLRequest): Move method into 8 !USE(CFNETWORK) section since it's also defined in 9 cf/ResourceRequestCFNet.cpp on iOS. 10 1 11 2013-03-18 Alpha Lam <hclam@chromium.org> 2 12 -
trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm
r146088 r146177 56 56 } 57 57 58 CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const59 {60 return [nsURLRequest(bodyPolicy) _CFURLRequest];61 }62 63 58 #if USE(CFNETWORK) 64 59 … … 77 72 78 73 #else 74 75 CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const 76 { 77 return [nsURLRequest(bodyPolicy) _CFURLRequest]; 78 } 79 79 80 80 void ResourceRequest::doUpdateResourceRequest()
Note: See TracChangeset
for help on using the changeset viewer.