<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186137] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186137">186137</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-06-30 15:19:26 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/175171">r175171</a>
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequesth">trunk/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186136 => 186137)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-30 Chris Dumez <cdumez@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2015-06-30 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Reduce rendering frames "Other" time by instrumenting compositing
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (186136 => 186137)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "ResourceRequestBase.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-OBJC_CLASS NSMutableURLRequest;
</del><span class="cx"> OBJC_CLASS NSURLRequest;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || USE(CFNETWORK)
</span><span class="lines">@@ -128,10 +127,6 @@
</span><span class="cx"> void doUpdatePlatformHTTPBody();
</span><span class="cx"> void doUpdateResourceHTTPBody();
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
- NSMutableURLRequest *ensureMutableNSURLRequest();
-#endif
-
</del><span class="cx"> std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData>) const;
</span><span class="cx"> void doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (186136 => 186137)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -118,17 +118,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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();
-}
-
</del><span class="cx"> void ResourceRequest::doUpdatePlatformRequest()
</span><span class="cx"> {
</span><span class="cx"> if (isNull()) {
</span><span class="lines">@@ -136,8 +125,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSMutableURLRequest *nsRequest = ensureMutableNSURLRequest();
</del><ins>+ NSMutableURLRequest *nsRequest = [m_nsRequest.get() mutableCopy];
</ins><span class="cx">
</span><ins>+ if (nsRequest)
+ [nsRequest setURL:url()];
+ else
+ nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
+
</ins><span class="cx"> if (ResourceRequest::httpPipeliningEnabled())
</span><span class="cx"> wkHTTPRequestEnablePipelining([nsRequest _CFURLRequest]);
</span><span class="cx">
</span><span class="lines">@@ -178,6 +172,8 @@
</span><span class="cx"> [NSURLProtocol setProperty:partitionValue forKey:(NSString *)wkCachePartitionKey() inRequest:nsRequest];
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+
+ m_nsRequest = adoptNS(nsRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::doUpdatePlatformHTTPBody()
</span><span class="lines">@@ -187,8 +183,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSMutableURLRequest *nsRequest = ensureMutableNSURLRequest();
</del><ins>+ NSMutableURLRequest *nsRequest = [m_nsRequest.get() mutableCopy];
</ins><span class="cx">
</span><ins>+ if (nsRequest)
+ [nsRequest setURL:url()];
+ else
+ nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
+
</ins><span class="cx"> RefPtr<FormData> formData = httpBody();
</span><span class="cx"> if (formData && !formData->isEmpty())
</span><span class="cx"> WebCore::setHTTPBody(nsRequest, formData);
</span><span class="lines">@@ -203,6 +204,8 @@
</span><span class="cx"> m_httpHeaderFields.set(HTTPHeaderName::ContentLength, lengthString);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ m_nsRequest = adoptNS(nsRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>