Title: [186137] trunk/Source/WebCore
- Revision
- 186137
- Author
- [email protected]
- Date
- 2015-06-30 15:19:26 -0700 (Tue, 30 Jun 2015)
Log Message
Rolling out r175171
https://bugs.webkit.org/show_bug.cgi?id=146470
<rdar://problem/21349934>
Unreviewed, rolling out <http://trac.webkit.org/changeset/175171>. It
wasn't a huge win and Brady says it caused crash at
<rdar://problem/21349934>.
* platform/network/cf/ResourceRequest.h:
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186136 => 186137)
--- trunk/Source/WebCore/ChangeLog 2015-06-30 22:19:05 UTC (rev 186136)
+++ trunk/Source/WebCore/ChangeLog 2015-06-30 22:19:26 UTC (rev 186137)
@@ -1,3 +1,18 @@
+2015-06-30 Chris Dumez <[email protected]>
+
+ Rolling out r175171
+ https://bugs.webkit.org/show_bug.cgi?id=146470
+ <rdar://problem/21349934>
+
+ Unreviewed, rolling out <http://trac.webkit.org/changeset/175171>. It
+ wasn't a huge win and Brady says it caused crash at
+ <rdar://problem/21349934>.
+
+ * platform/network/cf/ResourceRequest.h:
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+
2015-06-30 Matt Baker <[email protected]>
Web Inspector: Reduce rendering frames "Other" time by instrumenting compositing
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (186136 => 186137)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2015-06-30 22:19:05 UTC (rev 186136)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2015-06-30 22:19:26 UTC (rev 186137)
@@ -30,7 +30,6 @@
#include "ResourceRequestBase.h"
#include <wtf/RetainPtr.h>
-OBJC_CLASS NSMutableURLRequest;
OBJC_CLASS NSURLRequest;
#if PLATFORM(COCOA) || USE(CFNETWORK)
@@ -128,10 +127,6 @@
void doUpdatePlatformHTTPBody();
void doUpdateResourceHTTPBody();
-#if PLATFORM(COCOA)
- NSMutableURLRequest *ensureMutableNSURLRequest();
-#endif
-
std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData>) const;
void doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData>);
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (186136 => 186137)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2015-06-30 22:19:05 UTC (rev 186136)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2015-06-30 22:19:26 UTC (rev 186137)
@@ -118,17 +118,6 @@
}
}
-inline NSMutableURLRequest *ResourceRequest::ensureMutableNSURLRequest()
-{
- if (m_nsRequest) {
- if (![m_nsRequest.get() isKindOfClass:[NSMutableURLRequest class]])
- m_nsRequest = adoptNS([m_nsRequest.get() mutableCopy]);
- [(NSMutableURLRequest *)m_nsRequest.get() setURL:url()];
- } else
- m_nsRequest = adoptNS([[NSMutableURLRequest alloc] initWithURL:url()]);
- return (NSMutableURLRequest *)m_nsRequest.get();
-}
-
void ResourceRequest::doUpdatePlatformRequest()
{
if (isNull()) {
@@ -136,8 +125,13 @@
return;
}
- NSMutableURLRequest *nsRequest = ensureMutableNSURLRequest();
+ NSMutableURLRequest *nsRequest = [m_nsRequest.get() mutableCopy];
+ if (nsRequest)
+ [nsRequest setURL:url()];
+ else
+ nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
+
if (ResourceRequest::httpPipeliningEnabled())
wkHTTPRequestEnablePipelining([nsRequest _CFURLRequest]);
@@ -178,6 +172,8 @@
[NSURLProtocol setProperty:partitionValue forKey:(NSString *)wkCachePartitionKey() inRequest:nsRequest];
}
#endif
+
+ m_nsRequest = adoptNS(nsRequest);
}
void ResourceRequest::doUpdatePlatformHTTPBody()
@@ -187,8 +183,13 @@
return;
}
- NSMutableURLRequest *nsRequest = ensureMutableNSURLRequest();
+ 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);
@@ -203,6 +204,8 @@
m_httpHeaderFields.set(HTTPHeaderName::ContentLength, lengthString);
}
}
+
+ m_nsRequest = adoptNS(nsRequest);
}
#if !PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
