Summary: | ResourceRequestCFNet.cpp won't compile after r144216 | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | David Kilzer (:ddkilzer) <ddkilzer> | ||||||
Component: | Page Loading | Assignee: | David Kilzer (:ddkilzer) <ddkilzer> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | ap, beidson, jberlin, roger_fong, webkit.review.bot | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Bug Depends on: | 110900 | ||||||||
Bug Blocks: | |||||||||
Attachments: |
|
Description
David Kilzer (:ddkilzer)
2013-02-27 20:42:39 PST
Here are the compiler errors generated: Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:200:30: error: use of undeclared identifier 'nsRequest' WebCore::setHTTPBody(nsRequest, formData); ^ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:202:95: error: use of undeclared identifier 'request' if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(request))) { ^ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:206:84: error: too many arguments provided to function-like macro invocation CFURLRequestSetHTTPHeaderFieldValue(cfRequest, CFSTR("Contemt-Length", lengthString.get())); ^ In file included from Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:1: In file included from Source/WebCore/WebCorePrefix.h:136: In file included from /System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:44: In file included from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFCalendar.h:11: In file included from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFTimeZone.h:13: /System/Library/Frameworks/CoreFoundation.framework/Headers/CFString.h:149:9: note: macro 'CFSTR' defined here #define CFSTR(cStr) ((CFStringRef) __builtin___CFStringMakeConstantString ("" cStr "")) ^ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:206:60: error: use of undeclared identifier 'CFSTR' CFURLRequestSetHTTPHeaderFieldValue(cfRequest, CFSTR("Contemt-Length", lengthString.get())); ^ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:287:100: error: use of undeclared identifier 'request' else if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(request))) { ^ In file included from Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:29: In file included from Source/WebCore/platform/network/ResourceHandle.h:37: In file included from Source/WebCore/platform/network/ios/QuickLook.h:13: In file included from Source/WebCore/platform/network/cf/ResourceRequest.h:32: WebKitBuild/Release-iphoneos/usr/local/include/wtf/RetainPtr.h:129:11: error: cannot initialize a member subobject of type 'PtrType' (aka 'const __CFString *') with an rvalue of type 'PtrType' (aka 'const void *') : m_ptr(o.get()) ^ ~~~~~~~ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:204:47: note: in instantiation of function template specialization 'WTF::RetainPtr<const __CFString *>::RetainPtr<const void *>' requested here RetainPtr<CFStringRef> lengthString = adoptCF(CFReadStreamCopyProperty(bodyStream.get(), formDataStreamLengthPropertyName())); ^ 6 errors generated. Sorry about this - the plan was to fix errors after landing, but we couldn't do it this afternoon.
> There was also a bad typo ("Contemt-Length") in ResourceRequestCFNet.cpp.
Oops!
(note that the patch is _still_ #92 on Windows EWS) And some linker failures: Undefined symbols for architecture armv7: "__ZN7WebCore15ResourceRequest39updateFromDelegatePreservingOldHTTPBodyERKS0_", referenced from: -exported_symbol[s_list] command line option "__ZNK7WebCore15ResourceRequest12cfURLRequestEv", referenced from: -exported_symbol[s_list] command line option ld: symbol(s) not found for architecture armv7 clang: error: linker command failed with exit code 1 (use -v to see invocation) I also don't see where this method is implemented: + void updateFromDelegatePreservingOldHTTPBody(CFURLRequestRef); Although it doesn't appear to be used, so maybe that doesn't matter. Yes, updateFromDelegatePreservingOldHTTPBody is only needed for WebKit2 (and in fact, its signature is now different, I should have removed it from CF part). Created attachment 190648 [details]
Patch v1
Fixes the compiler and linker errors for iOS.
Comment on attachment 190648 [details]
Patch v1
I have a better patch with a ChangeLog.
Created attachment 190651 [details]
Patch v2
Comment on attachment 190651 [details] Patch v2 Clearing flags on attachment: 190651 Committed r144278: <http://trac.webkit.org/changeset/144278> All reviewed patches have been landed. Closing bug. |