<!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>[202121] trunk/Source</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/202121">202121</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-15 19:59:54 -0700 (Wed, 15 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Clean up / optimize ResourceResponse::platformLazyInit(InitLevel)
https://bugs.webkit.org/show_bug.cgi?id=158809
Reviewed by Darin Adler.
Source/WebCore:
Clean up / optimize ResourceResponse::platformLazyInit(InitLevel).
* platform/network/HTTPParsers.cpp:
(WebCore::extractReasonPhraseFromHTTPStatusLine):
* platform/network/HTTPParsers.h:
Have extractReasonPhraseFromHTTPStatusLine() return an AtomicString as the
Reason is stored as an AtomicString on ResourceResponse. Have the
implementation use StringView::subString()::toAtomicString().
* platform/network/cocoa/ResourceResponseCocoa.mm:
(WebCore::stripLeadingAndTrailingDoubleQuote):
Move the stripLeadingAndTrailingDoubleQuote logic from platformLazyInit()
to its own function. Have it use StringView::subString()::toAtomicString()
to avoid unnecessarily atomizing the textEncodingName that has surrounding
double-quotes.
(WebCore::initializeHTTPHeaders):
Move HTTP headers initialization to its own function for clarity.
(WebCore::extractHTTPStatusText):
Move HTTP status Text extraction to its own function for clarity.
(WebCore::ResourceResponse::platformLazyInit):
- The function is streamlined a bit because most of the logic was moved
into separate functions.
- Drop unnecessary (initLevel >= CommonFieldsOnly) check in the first
if case and replace with an assertion. This function is always called
with CommonFieldsOnly or above (AllFields).
- Drop unnecessary (m_initLevel < AllFields) check in the second if
case as this is always true. If not, we would have returned early
at the beginning of the function when checking
m_initLevel >= initLevel.
- Use AutodrainedPool instead of NSAutoreleasePool for convenience and have
only 1 pool instead of 2.
- Drop unnecessary copyNSURLResponseStatusLine() function and call directly
CFHTTPMessageCopyResponseStatusLine() since we already have a
CFHTTPMessageRef at the call site.
Source/WTF:
Add toAtomicString() method to StringView to avoid having to call toString()
and then atomizing the String at call sites.
* wtf/text/StringView.h:
(WTF::StringView::toAtomicString):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewh">trunk/Source/WTF/wtf/text/StringView.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParserscpp">trunk/Source/WebCore/platform/network/HTTPParsers.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParsersh">trunk/Source/WebCore/platform/network/HTTPParsers.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (202120 => 202121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-16 02:20:04 UTC (rev 202120)
+++ trunk/Source/WTF/ChangeLog 2016-06-16 02:59:54 UTC (rev 202121)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-15 Chris Dumez <cdumez@apple.com>
+
+ [Cocoa] Clean up / optimize ResourceResponse::platformLazyInit(InitLevel)
+ https://bugs.webkit.org/show_bug.cgi?id=158809
+
+ Reviewed by Darin Adler.
+
+ Add toAtomicString() method to StringView to avoid having to call toString()
+ and then atomizing the String at call sites.
+
+ * wtf/text/StringView.h:
+ (WTF::StringView::toAtomicString):
+
</ins><span class="cx"> 2016-06-15 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Improve HashMap and HashSet support for Ref
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (202120 => 202121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2016-06-16 02:20:04 UTC (rev 202120)
+++ trunk/Source/WTF/wtf/text/StringView.h 2016-06-16 02:59:54 UTC (rev 202121)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx">
</span><span class="cx"> String toString() const;
</span><span class="cx"> String toStringWithoutCopying() const;
</span><ins>+ AtomicString toAtomicString() const;
</ins><span class="cx">
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> // This function converts null strings to empty strings.
</span><span class="lines">@@ -451,6 +452,13 @@
</span><span class="cx"> return String(characters16(), length());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline AtomicString StringView::toAtomicString() const
+{
+ if (is8Bit())
+ return AtomicString(characters8(), m_length);
+ return AtomicString(characters16(), length());
+}
+
</ins><span class="cx"> inline float StringView::toFloat(bool& isValid) const
</span><span class="cx"> {
</span><span class="cx"> if (is8Bit())
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202120 => 202121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-16 02:20:04 UTC (rev 202120)
+++ trunk/Source/WebCore/ChangeLog 2016-06-16 02:59:54 UTC (rev 202121)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-06-15 Chris Dumez <cdumez@apple.com>
+
+ [Cocoa] Clean up / optimize ResourceResponse::platformLazyInit(InitLevel)
+ https://bugs.webkit.org/show_bug.cgi?id=158809
+
+ Reviewed by Darin Adler.
+
+ Clean up / optimize ResourceResponse::platformLazyInit(InitLevel).
+
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::extractReasonPhraseFromHTTPStatusLine):
+ * platform/network/HTTPParsers.h:
+ Have extractReasonPhraseFromHTTPStatusLine() return an AtomicString as the
+ Reason is stored as an AtomicString on ResourceResponse. Have the
+ implementation use StringView::subString()::toAtomicString().
+
+ * platform/network/cocoa/ResourceResponseCocoa.mm:
+ (WebCore::stripLeadingAndTrailingDoubleQuote):
+ Move the stripLeadingAndTrailingDoubleQuote logic from platformLazyInit()
+ to its own function. Have it use StringView::subString()::toAtomicString()
+ to avoid unnecessarily atomizing the textEncodingName that has surrounding
+ double-quotes.
+
+ (WebCore::initializeHTTPHeaders):
+ Move HTTP headers initialization to its own function for clarity.
+
+ (WebCore::extractHTTPStatusText):
+ Move HTTP status Text extraction to its own function for clarity.
+
+ (WebCore::ResourceResponse::platformLazyInit):
+ - The function is streamlined a bit because most of the logic was moved
+ into separate functions.
+ - Drop unnecessary (initLevel >= CommonFieldsOnly) check in the first
+ if case and replace with an assertion. This function is always called
+ with CommonFieldsOnly or above (AllFields).
+ - Drop unnecessary (m_initLevel < AllFields) check in the second if
+ case as this is always true. If not, we would have returned early
+ at the beginning of the function when checking
+ m_initLevel >= initLevel.
+ - Use AutodrainedPool instead of NSAutoreleasePool for convenience and have
+ only 1 pool instead of 2.
+ - Drop unnecessary copyNSURLResponseStatusLine() function and call directly
+ CFHTTPMessageCopyResponseStatusLine() since we already have a
+ CFHTTPMessageRef at the call site.
+
</ins><span class="cx"> 2016-06-15 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> <attachment> elements jump around a lot around when subtitle text changes slightly
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParserscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (202120 => 202121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2016-06-16 02:20:04 UTC (rev 202120)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2016-06-16 02:59:54 UTC (rev 202121)
</span><span class="lines">@@ -461,12 +461,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-String extractReasonPhraseFromHTTPStatusLine(const String& statusLine)
</del><ins>+AtomicString extractReasonPhraseFromHTTPStatusLine(const String& statusLine)
</ins><span class="cx"> {
</span><del>- size_t spacePos = statusLine.find(' ');
</del><ins>+ StringView view = statusLine;
+ size_t spacePos = view.find(' ');
</ins><span class="cx"> // Remove status code from the status line.
</span><del>- spacePos = statusLine.find(' ', spacePos + 1);
- return statusLine.substring(spacePos + 1);
</del><ins>+ spacePos = view.find(' ', spacePos + 1);
+ return view.substring(spacePos + 1).toAtomicString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> XFrameOptionsDisposition parseXFrameOptionsHeader(const String& header)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParsersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.h (202120 => 202121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.h 2016-06-16 02:20:04 UTC (rev 202120)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.h 2016-06-16 02:59:54 UTC (rev 202121)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> String extractCharsetFromMediaType(const String&);
</span><span class="cx"> void findCharsetInMediaType(const String& mediaType, unsigned int& charsetPos, unsigned int& charsetLen, unsigned int start = 0);
</span><span class="cx"> XSSProtectionDisposition parseXSSProtectionHeader(const String& header, String& failureReason, unsigned& failurePosition, String& reportURL);
</span><del>-String extractReasonPhraseFromHTTPStatusLine(const String&);
</del><ins>+AtomicString extractReasonPhraseFromHTTPStatusLine(const String&);
</ins><span class="cx"> XFrameOptionsDisposition parseXFrameOptionsHeader(const String&);
</span><span class="cx">
</span><span class="cx"> // -1 could be set to one of the return parameters to indicate the value is not specified.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (202120 => 202121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2016-06-16 02:20:04 UTC (rev 202120)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2016-06-16 02:59:54 UTC (rev 202121)
</span><span class="lines">@@ -33,7 +33,10 @@
</span><span class="cx"> #import "WebCoreURLResponse.h"
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <limits>
</span><ins>+#import <wtf/AutodrainedPool.h>
+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/StdLibExtras.h>
</span><ins>+#import <wtf/text/StringView.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -145,89 +148,80 @@
</span><span class="cx"> initNSURLResponse();
</span><span class="cx"> return m_nsResponse.get();
</span><span class="cx"> }
</span><del>-
-static NSString *copyNSURLResponseStatusLine(NSURLResponse *response)
</del><ins>+
+static void addToHTTPHeaderMap(const void* key, const void* value, void* context)
</ins><span class="cx"> {
</span><del>- CFURLResponseRef cfResponse = [response _CFURLResponse];
- if (!cfResponse)
- return nil;
</del><ins>+ HTTPHeaderMap* httpHeaderMap = (HTTPHeaderMap*)context;
+ httpHeaderMap->set((CFStringRef)key, (CFStringRef)value);
+}
</ins><span class="cx">
</span><del>- CFHTTPMessageRef cfHTTPMessage = CFURLResponseGetHTTPResponse(cfResponse);
- if (!cfHTTPMessage)
- return nil;
</del><ins>+static inline AtomicString stripLeadingAndTrailingDoubleQuote(const String& value)
+{
+ unsigned length = value.length();
+ if (length < 2 || value[0u] != '"' || value[length - 1] != '"')
+ return value;
</ins><span class="cx">
</span><del>- return (NSString *)CFHTTPMessageCopyResponseStatusLine(cfHTTPMessage);
</del><ins>+ return StringView(value).substring(1, length - 2).toAtomicString();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void addToHTTPHeaderMap(const void* key, const void* value, void* context)
</del><ins>+enum class OnlyCommonHeaders { No, Yes };
+static inline void initializeHTTPHeaders(OnlyCommonHeaders onlyCommonHeaders, NSHTTPURLResponse *httpResponse, HTTPHeaderMap& headersMap)
</ins><span class="cx"> {
</span><del>- HTTPHeaderMap* httpHeaderMap = (HTTPHeaderMap*)context;
- httpHeaderMap->set((CFStringRef)key, (CFStringRef)value);
</del><ins>+ headersMap.clear();
+ auto messageRef = CFURLResponseGetHTTPResponse([httpResponse _CFURLResponse]);
+
+ // Avoid calling [NSURLResponse allHeaderFields] to minimize copying (<rdar://problem/26778863>).
+ auto headers = adoptCF(CFHTTPMessageCopyAllHeaderFields(messageRef));
+ if (onlyCommonHeaders == OnlyCommonHeaders::Yes) {
+ for (auto& commonHeader : commonHeaderFields) {
+ const void* value;
+ if (CFDictionaryGetValueIfPresent(headers.get(), commonHeader, &value))
+ headersMap.set(commonHeader, (CFStringRef) value);
+ }
+ return;
+ }
+ CFDictionaryApplyFunction(headers.get(), addToHTTPHeaderMap, &headersMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline AtomicString extractHTTPStatusText(CFHTTPMessageRef messageRef)
+{
+ if (auto httpStatusLine = adoptCF(CFHTTPMessageCopyResponseStatusLine(messageRef)))
+ return extractReasonPhraseFromHTTPStatusLine(httpStatusLine.get());
+
+ static NeverDestroyed<AtomicString> defaultStatusText("OK", AtomicString::ConstructFromLiteral);
+ return defaultStatusText;
+}
+
</ins><span class="cx"> void ResourceResponse::platformLazyInit(InitLevel initLevel)
</span><span class="cx"> {
</span><ins>+ ASSERT(initLevel >= CommonFieldsOnly);
+
</ins><span class="cx"> if (m_initLevel >= initLevel)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_isNull || !m_nsResponse)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_initLevel < CommonFieldsOnly && initLevel >= CommonFieldsOnly) {
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
</del><ins>+ AutodrainedPool pool;
</ins><span class="cx">
</span><del>- m_httpHeaderFields.clear();
</del><ins>+ NSHTTPURLResponse *httpResponse = [m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]] ? (NSHTTPURLResponse *)m_nsResponse.get() : nullptr;
+
+ if (m_initLevel < CommonFieldsOnly) {
</ins><span class="cx"> m_url = [m_nsResponse.get() URL];
</span><span class="cx"> m_mimeType = [m_nsResponse.get() MIMEType];
</span><span class="cx"> m_expectedContentLength = [m_nsResponse.get() expectedContentLength];
</span><del>- m_textEncodingName = [m_nsResponse.get() textEncodingName];
-
- // Workaround for <rdar://problem/8757088>, can be removed once that is fixed.
- unsigned textEncodingNameLength = m_textEncodingName.length();
- if (textEncodingNameLength >= 2 && m_textEncodingName[0U] == '"' && m_textEncodingName[textEncodingNameLength - 1] == '"')
- m_textEncodingName = m_textEncodingName.string().substring(1, textEncodingNameLength - 2);
-
- if ([m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]]) {
- NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
-
- m_httpStatusCode = [httpResponse statusCode];
-
- if (initLevel < AllFields) {
- CFHTTPMessageRef messageRef = CFURLResponseGetHTTPResponse([httpResponse _CFURLResponse]);
-
- // Avoid calling [NSURLResponse allHeaderFields] to minimize copying (<rdar://problem/26778863>).
- RetainPtr<CFDictionaryRef> headers = adoptCF(CFHTTPMessageCopyAllHeaderFields(messageRef));
- for (auto& commonHeader : commonHeaderFields) {
- CFStringRef value;
- if (CFDictionaryGetValueIfPresent(headers.get(), commonHeader, (const void **)&value))
- m_httpHeaderFields.set(commonHeader, value);
- }
- }
- } else
- m_httpStatusCode = 0;
-
- [pool drain];
</del><ins>+ // Stripping double quotes as a workaround for <rdar://problem/8757088>, can be removed once that is fixed.
+ m_textEncodingName = stripLeadingAndTrailingDoubleQuote([m_nsResponse.get() textEncodingName]);
+ m_httpStatusCode = httpResponse ? [httpResponse statusCode] : 0;
</ins><span class="cx"> }
</span><del>-
- if (m_initLevel < AllFields && initLevel == AllFields) {
- if ([m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]]) {
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-
- NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
- if (RetainPtr<NSString> httpStatusLine = adoptNS(copyNSURLResponseStatusLine(httpResponse)))
- m_httpStatusText = extractReasonPhraseFromHTTPStatusLine(httpStatusLine.get());
- else
- m_httpStatusText = AtomicString("OK", AtomicString::ConstructFromLiteral);
-
- CFHTTPMessageRef messageRef = CFURLResponseGetHTTPResponse([httpResponse _CFURLResponse]);
</del><ins>+ if (httpResponse) {
+ if (initLevel == AllFields) {
+ auto messageRef = CFURLResponseGetHTTPResponse([httpResponse _CFURLResponse]);
+ m_httpStatusText = extractHTTPStatusText(messageRef);
</ins><span class="cx"> m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(messageRef)).get()).convertToASCIIUppercase();
</span><del>-
- // Avoid calling [NSURLResponse allHeaderFields] to minimize copying (<rdar://problem/26778863>).
- RetainPtr<CFDictionaryRef> headers = adoptCF(CFHTTPMessageCopyAllHeaderFields(messageRef));
- CFDictionaryApplyFunction(headers.get(), addToHTTPHeaderMap, &m_httpHeaderFields);
-
- [pool drain];
- }
</del><ins>+ initializeHTTPHeaders(OnlyCommonHeaders::No, httpResponse, m_httpHeaderFields);
+ } else
+ initializeHTTPHeaders(OnlyCommonHeaders::Yes, httpResponse, m_httpHeaderFields);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_initLevel = initLevel;
</span></span></pre>
</div>
</div>
</body>
</html>