Diff
Modified: trunk/Source/WebCore/ChangeLog (170573 => 170574)
--- trunk/Source/WebCore/ChangeLog 2014-06-29 17:10:27 UTC (rev 170573)
+++ trunk/Source/WebCore/ChangeLog 2014-06-29 20:59:03 UTC (rev 170574)
@@ -1,3 +1,44 @@
+2014-06-29 Pratik Solanki <pratik.sola...@gmail.com>
+
+ Refactor ResourceRequest into Cocoa and iOS specific files
+ https://bugs.webkit.org/show_bug.cgi?id=134430
+
+ Reviewed by Andreas Kling.
+
+ No new tests because no functional changes.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::applyWebArchiveHackForMail): Deleted.
+ * platform/network/cocoa/ResourceRequestCocoa.mm: Copied from Source/WebCore/platform/network/mac/ResourceRequestMac.mm.
+ (WebCore::ResourceRequest::nsURLRequest):
+ (WebCore::ResourceRequest::cfURLRequest):
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::doUpdateResourceHTTPBody):
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+ (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties):
+ (WebCore::ResourceRequest::applyWebArchiveHackForMail):
+ (WebCore::ResourceRequest::setStorageSession):
+ * platform/network/ios/ResourceRequestIOS.mm: Added.
+ (WebCore::ResourceRequest::useQuickLookResourceCachingQuirks):
+ (WebCore::ResourceRequest::ResourceRequest):
+ (WebCore::ResourceRequest::updateNSURLRequest):
+ * platform/network/mac/ResourceRequestMac.mm:
+ (WebCore::initQuickLookResourceCachingQuirks):
+ (WebCore::ResourceRequest::useQuickLookResourceCachingQuirks):
+ (WebCore::ResourceRequest::ResourceRequest):
+ (WebCore::ResourceRequest::updateNSURLRequest):
+ (WebCore::ResourceRequest::applyWebArchiveHackForMail):
+ (WebCore::ResourceRequest::nsURLRequest): Deleted.
+ (WebCore::ResourceRequest::cfURLRequest): Deleted.
+ (WebCore::ResourceRequest::doUpdateResourceRequest): Deleted.
+ (WebCore::ResourceRequest::doUpdateResourceHTTPBody): Deleted.
+ (WebCore::ResourceRequest::doUpdatePlatformRequest): Deleted.
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody): Deleted.
+ (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Deleted.
+ (WebCore::ResourceRequest::setStorageSession): Deleted.
+
2014-06-29 Youenn Fablet <youenn.fab...@crf.canon.fr>
TextCodecICU::encode turns the whole string as yen signs if there is any backslash in it
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (170573 => 170574)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-29 17:10:27 UTC (rev 170573)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-29 20:59:03 UTC (rev 170574)
@@ -2442,6 +2442,8 @@
7E66E23317E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */; };
7E66E23416D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E66E23216D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h */; };
7E66E23417E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */; };
+ 7E7DE1FD195CEF260035363B /* ResourceRequestCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E7DE1FC195CEF260035363B /* ResourceRequestCocoa.mm */; };
+ 7E7DE202195CEFCD0035363B /* ResourceRequestIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */; };
7E99AF510B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */; };
7E99AF530B13846468FB01A5 /* WindowFocusAllowedIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E99AF540B13846468FB01A5 /* WindowFocusAllowedIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
7EA30F6916DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EA30F6716DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp */; };
@@ -9592,6 +9594,8 @@
7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLCompressedTexturePVRTC.cpp; path = canvas/WebGLCompressedTexturePVRTC.cpp; sourceTree = "<group>"; };
7E66E23216D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLCompressedTextureATC.h; path = canvas/WebGLCompressedTextureATC.h; sourceTree = "<group>"; };
7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLCompressedTexturePVRTC.h; path = canvas/WebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
+ 7E7DE1FC195CEF260035363B /* ResourceRequestCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ResourceRequestCocoa.mm; path = cocoa/ResourceRequestCocoa.mm; sourceTree = "<group>"; };
+ 7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestIOS.mm; sourceTree = "<group>"; };
7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFocusAllowedIndicator.cpp; sourceTree = "<group>"; };
7E99AF540B13846468FB01A5 /* WindowFocusAllowedIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowFocusAllowedIndicator.h; sourceTree = "<group>"; };
7EA30F6216DFD62700257D0B /* WebGLCompressedTextureATC.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLCompressedTextureATC.idl; path = canvas/WebGLCompressedTextureATC.idl; sourceTree = "<group>"; };
@@ -15706,6 +15710,7 @@
442AF7A8102CDDEA008FD4D3 /* QuickLook.mm */,
A10DBF4618F92317000D70C6 /* QuickLookHandleClient.h */,
7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */,
+ 7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */,
44A20DB80F84166C00B3E1FE /* WebCoreURLResponseIOS.h */,
444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */,
);
@@ -16278,6 +16283,7 @@
656B84D70AEA1CE900A095B4 /* network */ = {
isa = PBXGroup;
children = (
+ 7E7DE1FE195CEF2D0035363B /* cocoa */,
B2F34FE70E82F81700F627CD /* cf */,
4497D58C0EBA854F00A10552 /* ios */,
656B84E70AEA1DAE00A095B4 /* mac */,
@@ -16725,6 +16731,14 @@
path = icu;
sourceTree = "<group>";
};
+ 7E7DE1FE195CEF2D0035363B /* cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ 7E7DE1FC195CEF260035363B /* ResourceRequestCocoa.mm */,
+ );
+ name = cocoa;
+ sourceTree = "<group>";
+ };
7EE6847312D26E5500E79415 /* cf */ = {
isa = PBXGroup;
children = (
@@ -28265,6 +28279,7 @@
BC4918C80BFEA050009D6316 /* JSHTMLIFrameElement.cpp in Sources */,
1AE2AA970A1CDD2D00B42B25 /* JSHTMLImageElement.cpp in Sources */,
A80E7E980A1A83E3007FB8C5 /* JSHTMLInputElement.cpp in Sources */,
+ 7E7DE202195CEFCD0035363B /* ResourceRequestIOS.mm in Sources */,
BCC438780E886CC700533DD5 /* JSHTMLInputElementCustom.cpp in Sources */,
A6148A7812E41E3B0044A784 /* JSHTMLKeygenElement.cpp in Sources */,
1AE2AB210A1CE63B00B42B25 /* JSHTMLLabelElement.cpp in Sources */,
@@ -28824,6 +28839,7 @@
7CC69940191EC5F500AF2270 /* JSWebKitNamespace.cpp in Sources */,
E44613E30CD6819F00FADA75 /* MediaPlayer.cpp in Sources */,
072C8B11131C518600A4FCE9 /* MediaPlayerPrivateAVFoundation.cpp in Sources */,
+ 7E7DE1FD195CEF260035363B /* ResourceRequestCocoa.mm in Sources */,
DF9AFD7313FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm in Sources */,
CDC8B5A2180463470016E685 /* MediaPlayerPrivateMediaSourceAVFObjC.mm in Sources */,
E44613E50CD681A600FADA75 /* MediaPlayerPrivateQTKit.mm in Sources */,
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (170573 => 170574)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-29 17:10:27 UTC (rev 170573)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-29 20:59:03 UTC (rev 170574)
@@ -347,14 +347,6 @@
#endif
}
-#if PLATFORM(MAC)
-void ResourceRequest::applyWebArchiveHackForMail()
-{
- // Hack because Mail checks for this property to detect data / archive loads
- _CFURLRequestSetProtocolProperty(cfURLRequest(DoNotUpdateHTTPBody), CFSTR("WebDataRequest"), CFSTR(""));
-}
-#endif
-
#endif // USE(CFNETWORK)
bool ResourceRequest::httpPipeliningEnabled()
Copied: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (from rev 170573, trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm) (0 => 170574)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (rev 0)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-06-29 20:59:03 UTC (rev 170574)
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2014 Apple, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "ResourceRequest.h"
+
+#if PLATFORM(COCOA)
+
+#import "FormDataStreamMac.h"
+#import "HTTPHeaderNames.h"
+#import "ResourceRequestCFNet.h"
+#import "RuntimeApplicationChecks.h"
+#import "WebCoreSystemInterface.h"
+
+#import <Foundation/Foundation.h>
+#import <wtf/text/CString.h>
+
+@interface NSURLRequest (WebNSURLRequestDetails)
+- (NSArray *)contentDispositionEncodingFallbackArray;
++ (void)setDefaultTimeoutInterval:(NSTimeInterval)seconds;
+- (CFURLRequestRef)_CFURLRequest;
+- (id)_initWithCFURLRequest:(CFURLRequestRef)request;
+@end
+
+@interface NSMutableURLRequest (WebMutableNSURLRequestDetails)
+- (void)setContentDispositionEncodingFallbackArray:(NSArray *)theEncodingFallbackArray;
+@end
+
+namespace WebCore {
+
+NSURLRequest *ResourceRequest::nsURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
+{
+ updatePlatformRequest(bodyPolicy);
+ return [[m_nsRequest.get() retain] autorelease];
+}
+
+#if !USE(CFNETWORK)
+
+CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
+{
+ return [nsURLRequest(bodyPolicy) _CFURLRequest];
+}
+
+void ResourceRequest::doUpdateResourceRequest()
+{
+ m_url = [m_nsRequest.get() URL];
+ m_cachePolicy = (ResourceRequestCachePolicy)[m_nsRequest.get() cachePolicy];
+ m_timeoutInterval = [m_nsRequest.get() timeoutInterval];
+ m_firstPartyForCookies = [m_nsRequest.get() mainDocumentURL];
+
+ if (NSString* method = [m_nsRequest.get() HTTPMethod])
+ m_httpMethod = method;
+ m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies];
+
+ if (ResourceRequest::resourcePrioritiesEnabled())
+ m_priority = toResourceLoadPriority(wkGetHTTPRequestPriority([m_nsRequest.get() _CFURLRequest]));
+
+ NSDictionary *headers = [m_nsRequest.get() allHTTPHeaderFields];
+ NSEnumerator *e = [headers keyEnumerator];
+ NSString *name;
+ m_httpHeaderFields.clear();
+ while ((name = [e nextObject]))
+ m_httpHeaderFields.set(String(name), [headers objectForKey:name]);
+
+ m_responseContentDispositionEncodingFallbackArray.clear();
+ NSArray *encodingFallbacks = [m_nsRequest.get() contentDispositionEncodingFallbackArray];
+ NSUInteger count = [encodingFallbacks count];
+ for (NSUInteger i = 0; i < count; ++i) {
+ CFStringEncoding encoding = CFStringConvertNSStringEncodingToEncoding([(NSNumber *)[encodingFallbacks objectAtIndex:i] unsignedLongValue]);
+ if (encoding != kCFStringEncodingInvalidId)
+ m_responseContentDispositionEncodingFallbackArray.append(CFStringConvertEncodingToIANACharSetName(encoding));
+ }
+
+#if ENABLE(CACHE_PARTITIONING)
+ if (m_nsRequest) {
+ NSString* cachePartition = [NSURLProtocol propertyForKey:(NSString *)wkCachePartitionKey() inRequest:m_nsRequest.get()];
+ if (cachePartition)
+ m_cachePartition = cachePartition;
+ }
+#endif
+}
+
+void ResourceRequest::doUpdateResourceHTTPBody()
+{
+ if (NSData* bodyData = [m_nsRequest.get() HTTPBody])
+ m_httpBody = FormData::create([bodyData bytes], [bodyData length]);
+ else if (NSInputStream* bodyStream = [m_nsRequest.get() HTTPBodyStream]) {
+ FormData* formData = httpBodyFromStream(bodyStream);
+ // There is no FormData object if a client provided a custom data stream.
+ // We shouldn't be looking at http body after client callbacks.
+ ASSERT(formData);
+ if (formData)
+ m_httpBody = formData;
+ }
+}
+
+void ResourceRequest::doUpdatePlatformRequest()
+{
+ if (isNull()) {
+ m_nsRequest = nil;
+ return;
+ }
+
+ NSMutableURLRequest *nsRequest = [m_nsRequest.get() mutableCopy];
+
+ if (nsRequest)
+ [nsRequest setURL:url()];
+ else
+ nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
+
+ if (ResourceRequest::httpPipeliningEnabled())
+ wkHTTPRequestEnablePipelining([nsRequest _CFURLRequest]);
+
+ if (ResourceRequest::resourcePrioritiesEnabled())
+ wkSetHTTPRequestPriority([nsRequest _CFURLRequest], toPlatformRequestPriority(m_priority));
+
+ [nsRequest setCachePolicy:(NSURLRequestCachePolicy)cachePolicy()];
+ wkCFURLRequestAllowAllPostCaching([nsRequest _CFURLRequest]);
+
+ double timeoutInterval = ResourceRequestBase::timeoutInterval();
+ if (timeoutInterval)
+ [nsRequest setTimeoutInterval:timeoutInterval];
+ // Otherwise, respect NSURLRequest default timeout.
+
+ [nsRequest setMainDocumentURL:firstPartyForCookies()];
+ if (!httpMethod().isEmpty())
+ [nsRequest setHTTPMethod:httpMethod()];
+ [nsRequest setHTTPShouldHandleCookies:allowCookies()];
+
+ // Cannot just use setAllHTTPHeaderFields here, because it does not remove headers.
+ NSArray *oldHeaderFieldNames = [[nsRequest allHTTPHeaderFields] allKeys];
+ for (unsigned i = [oldHeaderFieldNames count]; i != 0; --i)
+ [nsRequest setValue:nil forHTTPHeaderField:[oldHeaderFieldNames objectAtIndex:i - 1]];
+ for (const auto& header : httpHeaderFields())
+ [nsRequest setValue:header.value forHTTPHeaderField:header.key];
+
+ NSMutableArray *encodingFallbacks = [NSMutableArray array];
+ unsigned count = m_responseContentDispositionEncodingFallbackArray.size();
+ for (unsigned i = 0; i != count; ++i) {
+ RetainPtr<CFStringRef> encodingName = m_responseContentDispositionEncodingFallbackArray[i].createCFString();
+ unsigned long nsEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName.get()));
+
+ if (nsEncoding != kCFStringEncodingInvalidId)
+ [encodingFallbacks addObject:[NSNumber numberWithUnsignedLong:nsEncoding]];
+ }
+ [nsRequest setContentDispositionEncodingFallbackArray:encodingFallbacks];
+
+#if ENABLE(CACHE_PARTITIONING)
+ String partition = cachePartition();
+ if (!partition.isNull() && !partition.isEmpty()) {
+ NSString *partitionValue = [NSString stringWithUTF8String:partition.utf8().data()];
+ [NSURLProtocol setProperty:partitionValue forKey:(NSString *)wkCachePartitionKey() inRequest:nsRequest];
+ }
+#endif
+
+ m_nsRequest = adoptNS(nsRequest);
+}
+
+void ResourceRequest::doUpdatePlatformHTTPBody()
+{
+ if (isNull()) {
+ ASSERT(!m_nsRequest);
+ return;
+ }
+
+ NSMutableURLRequest *nsRequest = [m_nsRequest.get() mutableCopy];
+
+ if (nsRequest)
+ [nsRequest setURL:url()];
+ else
+ nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
+
+ RefPtr<FormData> formData = httpBody();
+ if (formData && !formData->isEmpty())
+ WebCore::setHTTPBody(nsRequest, formData);
+
+ if (NSInputStream *bodyStream = [nsRequest HTTPBodyStream]) {
+ // For streams, provide a Content-Length to avoid using chunked encoding, and to get accurate total length in callbacks.
+ NSString *lengthString = [bodyStream propertyForKey:(NSString *)formDataStreamLengthPropertyName()];
+ if (lengthString) {
+ [nsRequest setValue:lengthString forHTTPHeaderField:@"Content-Length"];
+ // Since resource request is already marked updated, we need to keep it up to date too.
+ ASSERT(m_resourceRequestUpdated);
+ m_httpHeaderFields.set(HTTPHeaderName::ContentLength, lengthString);
+ }
+ }
+
+ m_nsRequest = adoptNS(nsRequest);
+}
+
+void ResourceRequest::updateFromDelegatePreservingOldProperties(const ResourceRequest& delegateProvidedRequest)
+{
+ RefPtr<FormData> oldHTTPBody = httpBody();
+#if ENABLE(INSPECTOR)
+ bool isHiddenFromInspector = hiddenFromInspector();
+#endif
+
+ *this = delegateProvidedRequest;
+
+ setHTTPBody(oldHTTPBody.release());
+#if ENABLE(INSPECTOR)
+ setHiddenFromInspector(isHiddenFromInspector);
+#endif
+}
+
+#if !PLATFORM(IOS)
+void ResourceRequest::applyWebArchiveHackForMail()
+{
+ // Hack because Mail checks for this property to detect data / archive loads
+ [NSURLProtocol setProperty:@"" forKey:@"WebDataRequest" inRequest:(NSMutableURLRequest *)nsURLRequest(DoNotUpdateHTTPBody)];
+}
+#endif
+
+void ResourceRequest::setStorageSession(CFURLStorageSessionRef storageSession)
+{
+ updatePlatformRequest();
+ m_nsRequest = adoptNS(wkCopyRequestWithStorageSession(storageSession, m_nsRequest.get()));
+}
+
+#endif // USE(CFNETWORK)
+
+} // namespace WebCore
+
+#endif // PLATFORM(COCOA)
+
Added: trunk/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm (0 => 170574)
--- trunk/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm (rev 0)
+++ trunk/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm 2014-06-29 20:59:03 UTC (rev 170574)
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2014 Apple, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "ResourceRequest.h"
+
+#if PLATFORM(IOS)
+
+@interface NSURLRequest (WebNSURLRequestDetails)
+- (CFURLRequestRef)_CFURLRequest;
+- (id)_initWithCFURLRequest:(CFURLRequestRef)request;
+@end
+
+namespace WebCore {
+
+bool ResourceRequest::useQuickLookResourceCachingQuirks()
+{
+ return false;
+}
+
+#if USE(CFNETWORK)
+
+ResourceRequest::ResourceRequest(NSURLRequest *nsRequest)
+ : ResourceRequestBase()
+ , m_mainResourceRequest(false)
+ , m_cfRequest([nsRequest _CFURLRequest])
+ , m_nsRequest(nsRequest)
+{
+}
+
+void ResourceRequest::updateNSURLRequest()
+{
+ // There is client code that extends NSURLRequest and expects to get back, in the delegate
+ // callbacks, an object of the same type that they passed into WebKit. To keep then running, we
+ // create an object of the same type and return that. See <rdar://9843582>.
+ // Also, developers really really want an NSMutableURLRequest so try to create an
+ // NSMutableURLRequest instead of NSURLRequest.
+ static Class nsURLRequestClass = [NSURLRequest class];
+ static Class nsMutableURLRequestClass = [NSMutableURLRequest class];
+ Class requestClass = [m_nsRequest.get() class];
+
+ if (!requestClass || requestClass == nsURLRequestClass)
+ requestClass = nsMutableURLRequestClass;
+
+ if (m_cfRequest)
+ m_nsRequest = adoptNS([[requestClass alloc] _initWithCFURLRequest:m_cfRequest.get()]);
+}
+
+#endif // USE(CFNETWORK)
+
+} // namespace WebCore
+
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm (170573 => 170574)
--- trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2014-06-29 17:10:27 UTC (rev 170573)
+++ trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2014-06-29 20:59:03 UTC (rev 170574)
@@ -26,257 +26,19 @@
#import "config.h"
#import "ResourceRequest.h"
-#import "FormDataStreamMac.h"
-#import "HTTPHeaderNames.h"
-#import "ResourceRequestCFNet.h"
+#if PLATFORM(MAC)
+
#import "RuntimeApplicationChecks.h"
-#import "WebCoreSystemInterface.h"
-#import <wtf/text/CString.h>
#import <Foundation/Foundation.h>
-
@interface NSURLRequest (WebNSURLRequestDetails)
-- (NSArray *)contentDispositionEncodingFallbackArray;
-+ (void)setDefaultTimeoutInterval:(NSTimeInterval)seconds;
- (CFURLRequestRef)_CFURLRequest;
- (id)_initWithCFURLRequest:(CFURLRequestRef)request;
@end
-@interface NSMutableURLRequest (WebMutableNSURLRequestDetails)
-- (void)setContentDispositionEncodingFallbackArray:(NSArray *)theEncodingFallbackArray;
-@end
-
namespace WebCore {
-NSURLRequest *ResourceRequest::nsURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
-{
- updatePlatformRequest(bodyPolicy);
-
- return [[m_nsRequest.get() retain] autorelease];
-}
-
-#if USE(CFNETWORK)
-
-ResourceRequest::ResourceRequest(NSURLRequest *nsRequest)
- : ResourceRequestBase()
-#if PLATFORM(IOS)
- , m_mainResourceRequest(false)
-#endif
- , m_cfRequest([nsRequest _CFURLRequest])
- , m_nsRequest(nsRequest)
-{
-}
-
-void ResourceRequest::updateNSURLRequest()
-{
-#if PLATFORM(IOS)
- // There is client code that extends NSURLRequest and expects to get back, in the delegate
- // callbacks, an object of the same type that they passed into WebKit. To keep then running, we
- // create an object of the same type and return that. See <rdar://9843582>.
- // Also, developers really really want an NSMutableURLRequest so try to create an
- // NSMutableURLRequest instead of NSURLRequest.
- static Class nsURLRequestClass = [NSURLRequest class];
- static Class nsMutableURLRequestClass = [NSMutableURLRequest class];
- Class requestClass = [m_nsRequest.get() class];
-
- if (!requestClass || requestClass == nsURLRequestClass)
- requestClass = nsMutableURLRequestClass;
-
- if (m_cfRequest)
- m_nsRequest = adoptNS([[requestClass alloc] _initWithCFURLRequest:m_cfRequest.get()]);
-#else
- if (m_cfRequest)
- m_nsRequest = adoptNS([[NSURLRequest alloc] _initWithCFURLRequest:m_cfRequest.get()]);
-#endif
-}
-
-#else
-
-CFURLRequestRef ResourceRequest::cfURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
-{
- return [nsURLRequest(bodyPolicy) _CFURLRequest];
-}
-
-void ResourceRequest::doUpdateResourceRequest()
-{
- m_url = [m_nsRequest.get() URL];
- m_cachePolicy = (ResourceRequestCachePolicy)[m_nsRequest.get() cachePolicy];
- m_timeoutInterval = [m_nsRequest.get() timeoutInterval];
- m_firstPartyForCookies = [m_nsRequest.get() mainDocumentURL];
-
- if (NSString* method = [m_nsRequest.get() HTTPMethod])
- m_httpMethod = method;
- m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies];
-
- if (ResourceRequest::resourcePrioritiesEnabled())
- m_priority = toResourceLoadPriority(wkGetHTTPRequestPriority([m_nsRequest.get() _CFURLRequest]));
-
- NSDictionary *headers = [m_nsRequest.get() allHTTPHeaderFields];
- NSEnumerator *e = [headers keyEnumerator];
- NSString *name;
- m_httpHeaderFields.clear();
- while ((name = [e nextObject]))
- m_httpHeaderFields.set(String(name), [headers objectForKey:name]);
-
- m_responseContentDispositionEncodingFallbackArray.clear();
- NSArray *encodingFallbacks = [m_nsRequest.get() contentDispositionEncodingFallbackArray];
- NSUInteger count = [encodingFallbacks count];
- for (NSUInteger i = 0; i < count; ++i) {
- CFStringEncoding encoding = CFStringConvertNSStringEncodingToEncoding([(NSNumber *)[encodingFallbacks objectAtIndex:i] unsignedLongValue]);
- if (encoding != kCFStringEncodingInvalidId)
- m_responseContentDispositionEncodingFallbackArray.append(CFStringConvertEncodingToIANACharSetName(encoding));
- }
-
-#if ENABLE(CACHE_PARTITIONING)
- if (m_nsRequest) {
- NSString* cachePartition = [NSURLProtocol propertyForKey:(NSString *)wkCachePartitionKey() inRequest:m_nsRequest.get()];
- if (cachePartition)
- m_cachePartition = cachePartition;
- }
-#endif
-}
-
-void ResourceRequest::doUpdateResourceHTTPBody()
-{
- if (NSData* bodyData = [m_nsRequest.get() HTTPBody])
- m_httpBody = FormData::create([bodyData bytes], [bodyData length]);
- else if (NSInputStream* bodyStream = [m_nsRequest.get() HTTPBodyStream]) {
- FormData* formData = httpBodyFromStream(bodyStream);
- // There is no FormData object if a client provided a custom data stream.
- // We shouldn't be looking at http body after client callbacks.
- ASSERT(formData);
- if (formData)
- m_httpBody = formData;
- }
-}
-
-void ResourceRequest::doUpdatePlatformRequest()
-{
- if (isNull()) {
- m_nsRequest = nil;
- return;
- }
-
- NSMutableURLRequest *nsRequest = [m_nsRequest.get() mutableCopy];
-
- if (nsRequest)
- [nsRequest setURL:url()];
- else
- nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
-
- if (ResourceRequest::httpPipeliningEnabled())
- wkHTTPRequestEnablePipelining([nsRequest _CFURLRequest]);
-
- if (ResourceRequest::resourcePrioritiesEnabled())
- wkSetHTTPRequestPriority([nsRequest _CFURLRequest], toPlatformRequestPriority(m_priority));
-
- [nsRequest setCachePolicy:(NSURLRequestCachePolicy)cachePolicy()];
- wkCFURLRequestAllowAllPostCaching([nsRequest _CFURLRequest]);
-
- double timeoutInterval = ResourceRequestBase::timeoutInterval();
- if (timeoutInterval)
- [nsRequest setTimeoutInterval:timeoutInterval];
- // Otherwise, respect NSURLRequest default timeout.
-
- [nsRequest setMainDocumentURL:firstPartyForCookies()];
- if (!httpMethod().isEmpty())
- [nsRequest setHTTPMethod:httpMethod()];
- [nsRequest setHTTPShouldHandleCookies:allowCookies()];
-
- // Cannot just use setAllHTTPHeaderFields here, because it does not remove headers.
- NSArray *oldHeaderFieldNames = [[nsRequest allHTTPHeaderFields] allKeys];
- for (unsigned i = [oldHeaderFieldNames count]; i != 0; --i)
- [nsRequest setValue:nil forHTTPHeaderField:[oldHeaderFieldNames objectAtIndex:i - 1]];
- for (const auto& header : httpHeaderFields())
- [nsRequest setValue:header.value forHTTPHeaderField:header.key];
-
- NSMutableArray *encodingFallbacks = [NSMutableArray array];
- unsigned count = m_responseContentDispositionEncodingFallbackArray.size();
- for (unsigned i = 0; i != count; ++i) {
- RetainPtr<CFStringRef> encodingName = m_responseContentDispositionEncodingFallbackArray[i].createCFString();
- unsigned long nsEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName.get()));
-
- if (nsEncoding != kCFStringEncodingInvalidId)
- [encodingFallbacks addObject:[NSNumber numberWithUnsignedLong:nsEncoding]];
- }
- [nsRequest setContentDispositionEncodingFallbackArray:encodingFallbacks];
-
-#if ENABLE(CACHE_PARTITIONING)
- String partition = cachePartition();
- if (!partition.isNull() && !partition.isEmpty()) {
- NSString *partitionValue = [NSString stringWithUTF8String:partition.utf8().data()];
- [NSURLProtocol setProperty:partitionValue forKey:(NSString *)wkCachePartitionKey() inRequest:nsRequest];
- }
-#endif
-
- m_nsRequest = adoptNS(nsRequest);
-}
-
-void ResourceRequest::doUpdatePlatformHTTPBody()
-{
- if (isNull()) {
- ASSERT(!m_nsRequest);
- return;
- }
-
- NSMutableURLRequest *nsRequest = [m_nsRequest.get() mutableCopy];
-
- if (nsRequest)
- [nsRequest setURL:url()];
- else
- nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
-
- RefPtr<FormData> formData = httpBody();
- if (formData && !formData->isEmpty())
- WebCore::setHTTPBody(nsRequest, formData);
-
- if (NSInputStream *bodyStream = [nsRequest HTTPBodyStream]) {
- // For streams, provide a Content-Length to avoid using chunked encoding, and to get accurate total length in callbacks.
- NSString *lengthString = [bodyStream propertyForKey:(NSString *)formDataStreamLengthPropertyName()];
- if (lengthString) {
- [nsRequest setValue:lengthString forHTTPHeaderField:@"Content-Length"];
- // Since resource request is already marked updated, we need to keep it up to date too.
- ASSERT(m_resourceRequestUpdated);
- m_httpHeaderFields.set(HTTPHeaderName::ContentLength, lengthString);
- }
- }
-
- m_nsRequest = adoptNS(nsRequest);
-}
-
-void ResourceRequest::updateFromDelegatePreservingOldProperties(const ResourceRequest& delegateProvidedRequest)
-{
- RefPtr<FormData> oldHTTPBody = httpBody();
-#if ENABLE(INSPECTOR)
- bool isHiddenFromInspector = hiddenFromInspector();
-#endif
-
- *this = delegateProvidedRequest;
-
- setHTTPBody(oldHTTPBody.release());
-#if ENABLE(INSPECTOR)
- setHiddenFromInspector(isHiddenFromInspector);
-#endif
-}
-
-#if !PLATFORM(IOS)
-void ResourceRequest::applyWebArchiveHackForMail()
-{
- // Hack because Mail checks for this property to detect data / archive loads
- [NSURLProtocol setProperty:@"" forKey:@"WebDataRequest" inRequest:(NSMutableURLRequest *)nsURLRequest(DoNotUpdateHTTPBody)];
-}
-#endif
-
-void ResourceRequest::setStorageSession(CFURLStorageSessionRef storageSession)
-{
- updatePlatformRequest();
- m_nsRequest = adoptNS(wkCopyRequestWithStorageSession(storageSession, m_nsRequest.get()));
-}
-
-#endif // USE(CFNETWORK)
-
-#if !PLATFORM(IOS)
static bool initQuickLookResourceCachingQuirks()
{
if (applicationIsSafari())
@@ -295,17 +57,36 @@
}
return false;
}
-#endif // !PLATFORM(IOS)
bool ResourceRequest::useQuickLookResourceCachingQuirks()
{
-#if !PLATFORM(IOS)
static bool flag = initQuickLookResourceCachingQuirks();
return flag;
-#else
- return false;
-#endif // !PLATFORM(IOS)
}
+#if USE(CFNETWORK)
+
+ResourceRequest::ResourceRequest(NSURLRequest *nsRequest)
+ : ResourceRequestBase()
+ , m_cfRequest([nsRequest _CFURLRequest])
+ , m_nsRequest(nsRequest)
+{
+}
+
+void ResourceRequest::updateNSURLRequest()
+{
+ if (m_cfRequest)
+ m_nsRequest = adoptNS([[NSURLRequest alloc] _initWithCFURLRequest:m_cfRequest.get()]);
+}
+
+void ResourceRequest::applyWebArchiveHackForMail()
+{
+ // Hack because Mail checks for this property to detect data / archive loads
+ _CFURLRequestSetProtocolProperty(cfURLRequest(DoNotUpdateHTTPBody), CFSTR("WebDataRequest"), CFSTR(""));
+}
+
+#endif
+
} // namespace WebCore
+#endif
