<!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>[175186] 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/175186">175186</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-24 15:24:30 -0700 (Fri, 24 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Use modern loops in ResourceRequestCocoa.mm
https://bugs.webkit.org/show_bug.cgi?id=138052
Reviewed by Darin Adler.
Use modern loops in ResourceRequestCocoa.mm and leverage Objective-C's
fast enumeration.
No new tests, no behavior change.
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::doUpdateResourceRequest):
- Use NSDictionary's block-based enumeration as we enumerate both keys
and values and this is faster than using fast enumeration of the keys
then calling [NSDictionary objectForKey:]
- Use Objective C's fast enumeration for
contentDispositionEncodingFallbackArray as this is faster and shorter
than index based access. Also use reserveCapacity() /
uncheckedAppend() for m_responseContentDispositionEncodingFallbackArray
as we know how many elements were are going to append in the common
case.
(WebCore::ResourceRequest::doUpdatePlatformRequest):
- Use fast enumeration for [nsRequest allHTTPHeaderFields] dictionary
keys instead of calling [NSDictionary allKeys] and then doing
index-based iteration, to avoid copying the keys to a new array.
Also do a forward enumeration instead of a reverse one. I don't see
why a backward enumeration would be necessary here. We are not
modifying the NSDictionary we are iterating over as
[nsRequest allHTTPHeaderFields] makes a copy.
- Use a modern C++ loop for
m_responseContentDispositionEncodingFallbackArray.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (175185 => 175186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-24 22:01:00 UTC (rev 175185)
+++ trunk/Source/WebCore/ChangeLog 2014-10-24 22:24:30 UTC (rev 175186)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-10-24 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Use modern loops in ResourceRequestCocoa.mm
+ https://bugs.webkit.org/show_bug.cgi?id=138052
+
+ Reviewed by Darin Adler.
+
+ Use modern loops in ResourceRequestCocoa.mm and leverage Objective-C's
+ fast enumeration.
+
+ No new tests, no behavior change.
+
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ - Use NSDictionary's block-based enumeration as we enumerate both keys
+ and values and this is faster than using fast enumeration of the keys
+ then calling [NSDictionary objectForKey:]
+ - Use Objective C's fast enumeration for
+ contentDispositionEncodingFallbackArray as this is faster and shorter
+ than index based access. Also use reserveCapacity() /
+ uncheckedAppend() for m_responseContentDispositionEncodingFallbackArray
+ as we know how many elements were are going to append in the common
+ case.
+
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ - Use fast enumeration for [nsRequest allHTTPHeaderFields] dictionary
+ keys instead of calling [NSDictionary allKeys] and then doing
+ index-based iteration, to avoid copying the keys to a new array.
+ Also do a forward enumeration instead of a reverse one. I don't see
+ why a backward enumeration would be necessary here. We are not
+ modifying the NSDictionary we are iterating over as
+ [nsRequest allHTTPHeaderFields] makes a copy.
+ - Use a modern C++ loop for
+ m_responseContentDispositionEncodingFallbackArray.
+
</ins><span class="cx"> 2014-10-24 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace INT_MIN/MAX / kFixedPointDenominator with intMin/MaxForLayoutUnit.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (175185 => 175186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-10-24 22:01:00 UTC (rev 175185)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-10-24 22:24:30 UTC (rev 175186)
</span><span class="lines">@@ -84,20 +84,18 @@
</span><span class="cx"> m_priority = priority;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSDictionary *headers = [m_nsRequest.get() allHTTPHeaderFields];
- NSEnumerator *e = [headers keyEnumerator];
- NSString *name;
</del><span class="cx"> m_httpHeaderFields.clear();
</span><del>- while ((name = [e nextObject]))
- m_httpHeaderFields.set(String(name), [headers objectForKey:name]);
</del><ins>+ [[m_nsRequest allHTTPHeaderFields] enumerateKeysAndObjectsUsingBlock: ^(NSString *name, NSString *value, BOOL *) {
+ m_httpHeaderFields.set(name, value);
+ }];
</ins><span class="cx">
</span><span class="cx"> m_responseContentDispositionEncodingFallbackArray.clear();
</span><span class="cx"> NSArray *encodingFallbacks = [m_nsRequest.get() contentDispositionEncodingFallbackArray];
</span><del>- NSUInteger count = [encodingFallbacks count];
- for (NSUInteger i = 0; i < count; ++i) {
- CFStringEncoding encoding = CFStringConvertNSStringEncodingToEncoding([(NSNumber *)[encodingFallbacks objectAtIndex:i] unsignedLongValue]);
</del><ins>+ m_responseContentDispositionEncodingFallbackArray.reserveCapacity([encodingFallbacks count]);
+ for (NSNumber *encodingFallback in [m_nsRequest contentDispositionEncodingFallbackArray]) {
+ CFStringEncoding encoding = CFStringConvertNSStringEncodingToEncoding([encodingFallback unsignedLongValue]);
</ins><span class="cx"> if (encoding != kCFStringEncodingInvalidId)
</span><del>- m_responseContentDispositionEncodingFallbackArray.append(CFStringConvertEncodingToIANACharSetName(encoding));
</del><ins>+ m_responseContentDispositionEncodingFallbackArray.uncheckedAppend(CFStringConvertEncodingToIANACharSetName(encoding));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="lines">@@ -163,18 +161,14 @@
</span><span class="cx"> [nsRequest setHTTPShouldHandleCookies:allowCookies()];
</span><span class="cx">
</span><span class="cx"> // Cannot just use setAllHTTPHeaderFields here, because it does not remove headers.
</span><del>- NSArray *oldHeaderFieldNames = [[nsRequest allHTTPHeaderFields] allKeys];
- for (unsigned i = [oldHeaderFieldNames count]; i != 0; --i)
- [nsRequest setValue:nil forHTTPHeaderField:[oldHeaderFieldNames objectAtIndex:i - 1]];
</del><ins>+ for (NSString *oldHeaderName in [nsRequest allHTTPHeaderFields])
+ [nsRequest setValue:nil forHTTPHeaderField:oldHeaderName];
</ins><span class="cx"> for (const auto& header : httpHeaderFields())
</span><span class="cx"> [nsRequest setValue:header.value forHTTPHeaderField:header.key];
</span><span class="cx">
</span><span class="cx"> NSMutableArray *encodingFallbacks = [NSMutableArray array];
</span><del>- unsigned count = m_responseContentDispositionEncodingFallbackArray.size();
- for (unsigned i = 0; i != count; ++i) {
- RetainPtr<CFStringRef> encodingName = m_responseContentDispositionEncodingFallbackArray[i].createCFString();
- unsigned long nsEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName.get()));
-
</del><ins>+ for (const auto& encodingName : m_responseContentDispositionEncodingFallbackArray) {
+ CFStringEncoding nsEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName.createCFString().get()));
</ins><span class="cx"> if (nsEncoding != kCFStringEncodingInvalidId)
</span><span class="cx"> [encodingFallbacks addObject:[NSNumber numberWithUnsignedLong:nsEncoding]];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>