<!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>[174717] 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/174717">174717</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-14 17:44:36 -0700 (Tue, 14 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Fix inefficiencies in ResourceResponse::platformLazyInit(InitLevel)
https://bugs.webkit.org/show_bug.cgi?id=137721
Reviewed by Geoffrey Garen.
There were several inefficiencies with the Mac implementation of
ResourceResponse::platformLazyInit(InitLevel):
1. We end up initializing uncommon fields even if called with
'CommonFieldsOnly' initLevel.
2. If called with 'AllFields' initLevel (and if currently
uninitialized), we end up populating m_httpHeaderFields twice, once
with only the common headers, then a second time with ALL the
headers. We can skip the common-header case in this case to avoid
wasting CPU time.
This patch addresses both inefficiencies and cleans up the code a
little bit to reduce variable scope and to use fast enumeration of
header names.
As a result, we spend almost twice as little time in platformLazyInit()
when loading msn.com (~30ms -> ~18ms).
No new tests, no behavior change.
* platform/network/mac/ResourceResponseMac.mm:
(WebCore::ResourceResponse::platformLazyInit):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm">trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174716 => 174717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-15 00:42:57 UTC (rev 174716)
+++ trunk/Source/WebCore/ChangeLog 2014-10-15 00:44:36 UTC (rev 174717)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-10-14 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Fix inefficiencies in ResourceResponse::platformLazyInit(InitLevel)
+ https://bugs.webkit.org/show_bug.cgi?id=137721
+
+ Reviewed by Geoffrey Garen.
+
+ There were several inefficiencies with the Mac implementation of
+ ResourceResponse::platformLazyInit(InitLevel):
+ 1. We end up initializing uncommon fields even if called with
+ 'CommonFieldsOnly' initLevel.
+ 2. If called with 'AllFields' initLevel (and if currently
+ uninitialized), we end up populating m_httpHeaderFields twice, once
+ with only the common headers, then a second time with ALL the
+ headers. We can skip the common-header case in this case to avoid
+ wasting CPU time.
+
+ This patch addresses both inefficiencies and cleans up the code a
+ little bit to reduce variable scope and to use fast enumeration of
+ header names.
+
+ As a result, we spend almost twice as little time in platformLazyInit()
+ when loading msn.com (~30ms -> ~18ms).
+
+ No new tests, no behavior change.
+
+ * platform/network/mac/ResourceResponseMac.mm:
+ (WebCore::ResourceResponse::platformLazyInit):
+
</ins><span class="cx"> 2014-10-14 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (Safari 7.1/8.0): Border-radius and overflow hidden renders incorrectly.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm (174716 => 174717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2014-10-15 00:42:57 UTC (rev 174716)
+++ trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2014-10-15 00:44:36 UTC (rev 174717)
</span><span class="lines">@@ -135,12 +135,13 @@
</span><span class="cx"> NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
</span><span class="cx">
</span><span class="cx"> m_httpStatusCode = [httpResponse statusCode];
</span><del>-
- NSDictionary *headers = [httpResponse allHeaderFields];
</del><span class="cx">
</span><del>- for (unsigned i = 0; i < WTF_ARRAY_LENGTH(commonHeaderFields); ++i) {
- if (NSString* headerValue = [headers objectForKey:commonHeaderFields[i]])
- m_httpHeaderFields.set(String(commonHeaderFields[i]), headerValue);
</del><ins>+ if (initLevel < AllFields) {
+ NSDictionary *headers = [httpResponse allHeaderFields];
+ for (unsigned i = 0; i < WTF_ARRAY_LENGTH(commonHeaderFields); ++i) {
+ if (NSString* headerValue = [headers objectForKey:commonHeaderFields[i]])
+ m_httpHeaderFields.set(String(commonHeaderFields[i]), headerValue);
+ }
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> m_httpStatusCode = 0;
</span><span class="lines">@@ -148,21 +149,18 @@
</span><span class="cx"> [pool drain];
</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"> if ([m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]]) {
</span><span class="cx"> NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
</span><span class="cx">
</span><span class="cx"> NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
</span><del>-
- RetainPtr<NSString> httpStatusLine = adoptNS(wkCopyNSURLResponseStatusLine(m_nsResponse.get()));
- if (httpStatusLine)
</del><ins>+ if (RetainPtr<NSString> httpStatusLine = adoptNS(wkCopyNSURLResponseStatusLine(httpResponse)))
</ins><span class="cx"> m_httpStatusText = extractReasonPhraseFromHTTPStatusLine(httpStatusLine.get());
</span><span class="cx"> else
</span><del>- m_httpStatusText = "OK";
</del><ins>+ m_httpStatusText = AtomicString("OK", AtomicString::ConstructFromLiteral);
</ins><span class="cx">
</span><span class="cx"> NSDictionary *headers = [httpResponse allHeaderFields];
</span><del>- NSEnumerator *e = [headers keyEnumerator];
- while (NSString *name = [e nextObject])
</del><ins>+ for (NSString *name in headers)
</ins><span class="cx"> m_httpHeaderFields.set(String(name), [headers objectForKey:name]);
</span><span class="cx">
</span><span class="cx"> [pool drain];
</span></span></pre>
</div>
</div>
</body>
</html>