<!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>[170771] tags/Safari-538.44.1/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/170771">170771</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-07-03 14:34:17 -0700 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/170762">r170762</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538441SourceWebCoreChangeLog">tags/Safari-538.44.1/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari538441SourceWebCoreplatformnetworkcfResourceRequesth">tags/Safari-538.44.1/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#tagsSafari538441SourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">tags/Safari-538.44.1/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#tagsSafari538441SourceWebCoreplatformnetworkiosResourceRequestIOSmm">tags/Safari-538.44.1/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538441SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.44.1/Source/WebCore/ChangeLog (170770 => 170771)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.44.1/Source/WebCore/ChangeLog 2014-07-03 21:29:40 UTC (rev 170770)
+++ tags/Safari-538.44.1/Source/WebCore/ChangeLog 2014-07-03 21:34:17 UTC (rev 170771)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-07-03 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r170762.
+
+ 2014-07-03 Pratik Solanki <psolanki@apple.com>
+
+ Preserve old behavior of creating an NSURLRequest of the exact same type as passed to us
+ https://bugs.webkit.org/show_bug.cgi?id=134605
+ <rdar://problem/17544641>
+
+ Reviewed by Andreas Kling.
+
+ We have client code that passes us a subclass of NSURLRequest to load resource. Later when
+ we call willSendRequest, they test to make sure they get an object of the same type. My
+ optimization in r170642 broke this path when I cleared out the NSURLRequest object. We
+ already had code in updateNSURLRequest() that was taking this quirk into account but I broke
+ that. Fix it by reverting to old behavior for such clients.
+
+ No new tests though we need one. I will add it later.
+
+ * platform/network/cf/ResourceRequest.h:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+ (WebCore::ResourceRequest::setStorageSession):
+ * platform/network/ios/ResourceRequestIOS.mm:
+ (WebCore::ResourceRequest::updateNSURLRequest):
+ (WebCore::ResourceRequest::clearOrUpdateNSURLRequest):
+
</ins><span class="cx"> 2014-07-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Relanding r170578, incorrect roll out was done in r170742.
</span></span></pre></div>
<a id="tagsSafari538441SourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.44.1/Source/WebCore/platform/network/cf/ResourceRequest.h (170770 => 170771)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.44.1/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-07-03 21:29:40 UTC (rev 170770)
+++ tags/Safari-538.44.1/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-07-03 21:34:17 UTC (rev 170771)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> ResourceRequest(NSURLRequest *);
</span><span class="cx"> void updateNSURLRequest();
</span><ins>+ void clearOrUpdateNSURLRequest();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ResourceRequest(CFURLRequestRef cfRequest)
</span></span></pre></div>
<a id="tagsSafari538441SourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.44.1/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (170770 => 170771)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.44.1/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-07-03 21:29:40 UTC (rev 170770)
+++ tags/Safari-538.44.1/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-07-03 21:34:17 UTC (rev 170771)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx">
</span><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- m_nsRequest = nullptr;
</del><ins>+ clearOrUpdateNSURLRequest();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- m_nsRequest = nullptr;
</del><ins>+ clearOrUpdateNSURLRequest();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> wkSetRequestStorageSession(storageSession, cfRequest);
</span><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- m_nsRequest = nullptr;
</del><ins>+ clearOrUpdateNSURLRequest();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538441SourceWebCoreplatformnetworkiosResourceRequestIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.44.1/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm (170770 => 170771)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.44.1/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm 2014-07-03 21:29:40 UTC (rev 170770)
+++ tags/Safari-538.44.1/Source/WebCore/platform/network/ios/ResourceRequestIOS.mm 2014-07-03 21:34:17 UTC (rev 170771)
</span><span class="lines">@@ -52,6 +52,12 @@
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::updateNSURLRequest()
</span><span class="cx"> {
</span><ins>+ if (m_cfRequest)
+ m_nsRequest = adoptNS([[NSMutableURLRequest alloc] _initWithCFURLRequest:m_cfRequest.get()]);
+}
+
+void ResourceRequest::clearOrUpdateNSURLRequest()
+{
</ins><span class="cx"> // There is client code that extends NSURLRequest and expects to get back, in the delegate
</span><span class="cx"> // callbacks, an object of the same type that they passed into WebKit. To keep then running, we
</span><span class="cx"> // create an object of the same type and return that. See <rdar://9843582>.
</span><span class="lines">@@ -61,11 +67,13 @@
</span><span class="cx"> static Class nsMutableURLRequestClass = [NSMutableURLRequest class];
</span><span class="cx"> Class requestClass = [m_nsRequest.get() class];
</span><span class="cx">
</span><del>- if (!requestClass || requestClass == nsURLRequestClass)
- requestClass = nsMutableURLRequestClass;
</del><ins>+ if (!m_cfRequest)
+ return;
</ins><span class="cx">
</span><del>- if (m_cfRequest)
</del><ins>+ if (requestClass && requestClass != nsURLRequestClass && requestClass != nsMutableURLRequestClass)
</ins><span class="cx"> m_nsRequest = adoptNS([[requestClass alloc] _initWithCFURLRequest:m_cfRequest.get()]);
</span><ins>+ else
+ m_nsRequest = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // USE(CFNETWORK)
</span></span></pre>
</div>
</div>
</body>
</html>