Changeset 146177 in webkit

Timestamp:

Mar 18, 2013 9:15:53 PM (11 years ago)

Author:

ddkilzer@apple.com

Message:

BUILD FIX (r146088): ResourceRequest::cfURLRequest() is defined twice on iOS
<​http://webkit.org/b/112387>

• platform/network/mac/ResourceRequestMac.mm:

(WebCore::ResourceRequest::cfURLRequest): Move method into
!USE(CFNETWORK) section since it's also defined in
cf/ResourceRequestCFNet.cpp on iOS.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/ResourceRequestMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-18  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX (r146088): ResourceRequest::cfURLRequest() is defined twice on iOS
+        <http://webkit.org/b/112387>
+
+        * platform/network/mac/ResourceRequestMac.mm:
+        (WebCore::ResourceRequest::cfURLRequest): Move method into
+        !USE(CFNETWORK) section since it's also defined in
+        cf/ResourceRequestCFNet.cpp on iOS.
+
 2013-03-18  Alpha Lam  <hclam@chromium.org>
 

trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm

@@ -56 +56 @@
 }
 
-CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
-{
-    return [nsURLRequest(bodyPolicy) _CFURLRequest];
-}
-
 #if USE(CFNETWORK)
 
@@ -77 +72 @@
 
 #else
+
+CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
+{
+    return [nsURLRequest(bodyPolicy) _CFURLRequest];
+}
 
 void ResourceRequest::doUpdateResourceRequest()