<!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>[180353] 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/180353">180353</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-19 11:43:06 -0800 (Thu, 19 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Fix inefficiencies in ResourceResponse::platformLazyInit()
https://bugs.webkit.org/show_bug.cgi?id=141744
Reviewed by Alexey Proskuryakov.
Fix inefficiencies in iOS's ResourceResponse::platformLazyInit()
implementation, similarly to what was already done for Mac in:
<http://trac.webkit.org/changeset/174717>
The following changes were made:
- Add missing "initLevel == AllFields" check before initializing
uncommon fields. This bug was causing us to initialize uncommon
fields even if called with 'CommonFieldsOnly' initLevel.
- Bypass the first pass populating common HTTP headers in
m_httpHeaderFields if the initLevel is AllFields. If called
with AllFields initLevel, we will end up populating all HTTP
headers later on so this first pass is redundant.
- Use C++11 range loop to iterator over commonHeaderFields array
for readability.
- Use CFDictionaryApplyFunction() to populate m_httpHeaderFields
for the CFDictionaryRef containing the headers instead of creating
copies of keys and values using CFDictionaryGetKeysAndValues() and
then iterating over those. This avoids allocating Vectors for keys /
values and avoids unnecessary copying.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceResponseCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180352 => 180353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-19 19:34:37 UTC (rev 180352)
+++ trunk/Source/WebCore/ChangeLog 2015-02-19 19:43:06 UTC (rev 180353)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-02-19 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Fix inefficiencies in ResourceResponse::platformLazyInit()
+ https://bugs.webkit.org/show_bug.cgi?id=141744
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fix inefficiencies in iOS's ResourceResponse::platformLazyInit()
+ implementation, similarly to what was already done for Mac in:
+ <http://trac.webkit.org/changeset/174717>
+
+ The following changes were made:
+ - Add missing "initLevel == AllFields" check before initializing
+ uncommon fields. This bug was causing us to initialize uncommon
+ fields even if called with 'CommonFieldsOnly' initLevel.
+ - Bypass the first pass populating common HTTP headers in
+ m_httpHeaderFields if the initLevel is AllFields. If called
+ with AllFields initLevel, we will end up populating all HTTP
+ headers later on so this first pass is redundant.
+ - Use C++11 range loop to iterator over commonHeaderFields array
+ for readability.
+ - Use CFDictionaryApplyFunction() to populate m_httpHeaderFields
+ for the CFDictionaryRef containing the headers instead of creating
+ copies of keys and values using CFDictionaryGetKeysAndValues() and
+ then iterating over those. This avoids allocating Vectors for keys /
+ values and avoids unnecessary copying.
+
+
</ins><span class="cx"> 2015-02-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Sufficiently small media controls should remove toolbar elements
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceResponseCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (180352 => 180353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2015-02-19 19:34:37 UTC (rev 180352)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2015-02-19 19:43:06 UTC (rev 180353)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> static CFStringRef const commonHeaderFields[] = {
</span><span class="cx"> CFSTR("Age"), CFSTR("Cache-Control"), CFSTR("Content-Type"), CFSTR("Date"), CFSTR("Etag"), CFSTR("Expires"), CFSTR("Last-Modified"), CFSTR("Pragma")
</span><span class="cx"> };
</span><del>-static const int numCommonHeaderFields = sizeof(commonHeaderFields) / sizeof(CFStringRef);
</del><span class="cx">
</span><span class="cx"> CFURLResponseRef ResourceResponse::cfURLResponse() const
</span><span class="cx"> {
</span><span class="lines">@@ -64,6 +63,12 @@
</span><span class="cx"> return m_cfResponse.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void addToHTTPHeaderMap(const void* key, const void* value, void* context)
+{
+ HTTPHeaderMap* httpHeaderMap = (HTTPHeaderMap*)context;
+ httpHeaderMap->set((CFStringRef)key, (CFStringRef)value);
+}
+
</ins><span class="cx"> void ResourceResponse::platformLazyInit(InitLevel initLevel)
</span><span class="cx"> {
</span><span class="cx"> if (m_initLevel > initLevel)
</span><span class="lines">@@ -87,30 +92,26 @@
</span><span class="cx"> if (httpResponse) {
</span><span class="cx"> m_httpStatusCode = CFHTTPMessageGetResponseStatusCode(httpResponse);
</span><span class="cx">
</span><del>- RetainPtr<CFDictionaryRef> headers = adoptCF(CFHTTPMessageCopyAllHeaderFields(httpResponse));
-
- for (int i = 0; i < numCommonHeaderFields; i++) {
- CFStringRef value;
- if (CFDictionaryGetValueIfPresent(headers.get(), commonHeaderFields[i], (const void **)&value))
- m_httpHeaderFields.set(commonHeaderFields[i], value);
</del><ins>+ if (initLevel < AllFields) {
+ RetainPtr<CFDictionaryRef> headers = adoptCF(CFHTTPMessageCopyAllHeaderFields(httpResponse));
+ for (auto& commonHeader : commonHeaderFields) {
+ CFStringRef value;
+ if (CFDictionaryGetValueIfPresent(headers.get(), commonHeader, (const void **)&value))
+ m_httpHeaderFields.set(commonHeader, value);
+ }
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> m_httpStatusCode = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_initLevel < AllFields) {
</del><ins>+ if (m_initLevel < AllFields && initLevel == AllFields) {
</ins><span class="cx"> CFHTTPMessageRef httpResponse = CFURLResponseGetHTTPResponse(m_cfResponse.get());
</span><span class="cx"> if (httpResponse) {
</span><span class="cx"> RetainPtr<CFStringRef> statusLine = adoptCF(CFHTTPMessageCopyResponseStatusLine(httpResponse));
</span><span class="cx"> m_httpStatusText = extractReasonPhraseFromHTTPStatusLine(statusLine.get());
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFDictionaryRef> headers = adoptCF(CFHTTPMessageCopyAllHeaderFields(httpResponse));
</span><del>- CFIndex headerCount = CFDictionaryGetCount(headers.get());
- Vector<const void*, 128> keys(headerCount);
- Vector<const void*, 128> values(headerCount);
- CFDictionaryGetKeysAndValues(headers.get(), keys.data(), values.data());
- for (int i = 0; i < headerCount; ++i)
- m_httpHeaderFields.set((CFStringRef)keys[i], (CFStringRef)values[i]);
</del><ins>+ CFDictionaryApplyFunction(headers.get(), addToHTTPHeaderMap, &m_httpHeaderFields);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>