ResourceRequestCFNet.cpp won't compile after r144216
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Feb 2013 09:39:22 +0000 (09:39 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Feb 2013 09:39:22 +0000 (09:39 +0000)
<http://webkit.org/b/111034>

Reviewed by Alexey Proskuryakov.

* WebCore.exp.in: Move Mac-only symbol into !PLATFORM(IOS)
section.  Update iOS-only symbol to add argument.
* platform/network/cf/ResourceRequest.h: Remove unused method
declaration.
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody): Fix typos.
Add static_cast<CFStringRef>().
(WebCore::ResourceRequest::doUpdateResourceHTTPBody): Fix another
typo.

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

Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/platform/network/cf/ResourceRequest.h
Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

index 408f0d2..f916f2e 100644 (file)
@@ -1,3 +1,20 @@
+2013-02-28  David Kilzer  <ddkilzer@apple.com>
+
+        ResourceRequestCFNet.cpp won't compile after r144216
+        <http://webkit.org/b/111034>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebCore.exp.in: Move Mac-only symbol into !PLATFORM(IOS)
+        section.  Update iOS-only symbol to add argument.
+        * platform/network/cf/ResourceRequest.h: Remove unused method
+        declaration.
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        (WebCore::ResourceRequest::doUpdatePlatformHTTPBody): Fix typos.
+        Add static_cast<CFStringRef>().
+        (WebCore::ResourceRequest::doUpdateResourceHTTPBody): Fix another
+        typo.
+
 2013-02-28  Kent Tamura  <tkent@chromium.org>
 
         Unreviewed, rolling out r144184.
index ba552fa..ff2a36a 100644 (file)
@@ -448,7 +448,6 @@ __ZN7WebCore15ProtectionSpaceC1ERKN3WTF6StringEiNS_25ProtectionSpaceServerTypeES
 __ZN7WebCore15ProtectionSpaceC1Ev
 __ZN7WebCore15ResourceRequest21httpPipeliningEnabledEv
 __ZN7WebCore15ResourceRequest24setHTTPPipeliningEnabledEb
-__ZN7WebCore15ResourceRequest39updateFromDelegatePreservingOldHTTPBodyERKS0_
 __ZN7WebCore15ScrollAlignment17alignCenterAlwaysE
 __ZN7WebCore15ScrollAlignment19alignToEdgeIfNeededE
 __ZN7WebCore15StorageStrategy21localStorageNamespaceERKN3WTF6StringEj
@@ -1715,6 +1714,7 @@ __ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE
 __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
 __ZN7WebCore15GraphicsContextC1EP9CGContext
 __ZN7WebCore15GraphicsContext15drawNativeImageEP7CGImageRKNS_9FloatSizeENS_10ColorSpaceERKNS_9FloatRectES9_NS_17CompositeOperatorENS_9BlendModeENS_16ImageOrientationE
+__ZN7WebCore15ResourceRequest39updateFromDelegatePreservingOldHTTPBodyERKS0_
 #if ENABLE(SPEECH_SYNTHESIS)
 __ZN7WebCore15SpeechSynthesis22setPlatformSynthesizerEN3WTF10PassOwnPtrINS_25PlatformSpeechSynthesizerEEE
 #endif
@@ -2288,7 +2288,7 @@ __ZN7WebCore8Settings15setQTKitEnabledEb
 #if USE(CFNETWORK)
 __ZNK7WebCore13ResourceErrorcvP9__CFErrorEv
 __ZN7WebCore12SchedulePairC1EP11__CFRunLoopPK10__CFString
-__ZNK7WebCore15ResourceRequest12cfURLRequestEv
+__ZNK7WebCore15ResourceRequest12cfURLRequestENS_20HTTPBodyUpdatePolicyE
 __ZNK7WebCore16ResourceResponse13cfURLResponseEv
 __ZN7WebCore14ResourceHandle28releaseConnectionForDownloadEv
 __ZN7WebCore15ResourceRequestC1EP12NSURLRequest
index a00baec..6211cc6 100644 (file)
@@ -80,8 +80,6 @@ namespace WebCore {
 #endif
         }
 
-        void updateFromDelegatePreservingOldHTTPBody(CFURLRequestRef);
-
         CFURLRequestRef cfURLRequest(HTTPBodyUpdatePolicy) const;
 #else
         ResourceRequest(NSURLRequest *nsRequest)
index d69bd5a..ac081c7 100644 (file)
@@ -190,13 +190,13 @@ void ResourceRequest::doUpdatePlatformHTTPBody()
 
     RefPtr<FormData> formData = httpBody();
     if (formData && !formData->isEmpty())
-        WebCore::setHTTPBody(nsRequest, formData);
+        WebCore::setHTTPBody(cfRequest, formData);
 
-    if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(request))) {
+    if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(cfRequest))) {
         // For streams, provide a Content-Length to avoid using chunked encoding, and to get accurate total length in callbacks.
-        RetainPtr<CFStringRef> lengthString = adoptCF(CFReadStreamCopyProperty(bodyStream.get(), formDataStreamLengthPropertyName()));
+        RetainPtr<CFStringRef> lengthString = adoptCF(static_cast<CFStringRef>(CFReadStreamCopyProperty(bodyStream.get(), formDataStreamLengthPropertyName())));
         if (lengthString) {
-            CFURLRequestSetHTTPHeaderFieldValue(cfRequest, CFSTR("Contemt-Length", lengthString.get()));
+            CFURLRequestSetHTTPHeaderFieldValue(cfRequest, CFSTR("Content-Length"), lengthString.get());
             // Since resource request is already marked updated, we need to keep it up to date too.
             ASSERT(m_resourceRequestUpdated);
             m_httpHeaderFields.set("Content-Length", lengthString.get());
@@ -262,7 +262,7 @@ void ResourceRequest::doUpdateResourceHTTPBody()
 
     if (RetainPtr<CFDataRef> bodyData = adoptCF(CFURLRequestCopyHTTPRequestBody(m_cfRequest.get())))
         m_httpBody = FormData::create(CFDataGetBytePtr(bodyData.get()), CFDataGetLength(bodyData.get()));
-    else if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(request))) {
+    else if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(m_cfRequest.get()))) {
         FormData* formData = httpBodyFromStream(bodyStream.get());
         // There is no FormData object if a client provided a custom data stream.
         // We shouldn't be looking at http body after client callbacks.