<!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>[162052] 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/162052">162052</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-14 22:51:34 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pack ResourceResponse harder.
<https://webkit.org/b/127005>
Re-arrange the members of ResourceResponse to reduce padding,
shrinking it by 8 bytes.
This nudges CachedResource and CachedImage into smaller size
classes, yielding a ~700 kB progression on Membuster3.
Reviewed by Anders Carlsson.
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::ResourceResponseBase):
* platform/network/ResourceResponseBase.h:
* platform/network/cf/ResourceResponse.h:
(WebCore::ResourceResponse::ResourceResponse):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBasecpp">trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBaseh">trunk/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceResponseh">trunk/Source/WebCore/platform/network/cf/ResourceResponse.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162051 => 162052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-15 06:50:13 UTC (rev 162051)
+++ trunk/Source/WebCore/ChangeLog 2014-01-15 06:51:34 UTC (rev 162052)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-14 Andreas Kling <akling@apple.com>
+
+ Pack ResourceResponse harder.
+ <https://webkit.org/b/127005>
+
+ Re-arrange the members of ResourceResponse to reduce padding,
+ shrinking it by 8 bytes.
+
+ This nudges CachedResource and CachedImage into smaller size
+ classes, yielding a ~700 kB progression on Membuster3.
+
+ Reviewed by Anders Carlsson.
+
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::ResourceResponseBase):
+ * platform/network/ResourceResponseBase.h:
+ * platform/network/cf/ResourceResponse.h:
+ (WebCore::ResourceResponse::ResourceResponse):
+
</ins><span class="cx"> 2014-01-14 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary WebkitCSSSVGDocumentValue
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp (162051 => 162052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-01-15 06:50:13 UTC (rev 162051)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-01-15 06:51:34 UTC (rev 162052)
</span><span class="lines">@@ -45,8 +45,13 @@
</span><span class="cx"> ResourceResponseBase::ResourceResponseBase()
</span><span class="cx"> : m_expectedContentLength(0)
</span><span class="cx"> , m_httpStatusCode(0)
</span><ins>+ , m_connectionID(0)
+ , m_cacheControlMaxAge(0)
+ , m_age(0)
+ , m_date(0)
+ , m_expires(0)
+ , m_lastModified(0)
</ins><span class="cx"> , m_wasCached(false)
</span><del>- , m_connectionID(0)
</del><span class="cx"> , m_connectionReused(false)
</span><span class="cx"> , m_isNull(true)
</span><span class="cx"> , m_haveParsedCacheControlHeader(false)
</span><span class="lines">@@ -57,11 +62,6 @@
</span><span class="cx"> , m_cacheControlContainsNoCache(false)
</span><span class="cx"> , m_cacheControlContainsNoStore(false)
</span><span class="cx"> , m_cacheControlContainsMustRevalidate(false)
</span><del>- , m_cacheControlMaxAge(0.0)
- , m_age(0.0)
- , m_date(0.0)
- , m_expires(0.0)
- , m_lastModified(0.0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,8 +72,13 @@
</span><span class="cx"> , m_textEncodingName(textEncodingName)
</span><span class="cx"> , m_suggestedFilename(filename)
</span><span class="cx"> , m_httpStatusCode(0)
</span><ins>+ , m_connectionID(0)
+ , m_cacheControlMaxAge(0)
+ , m_age(0)
+ , m_date(0)
+ , m_expires(0)
+ , m_lastModified(0)
</ins><span class="cx"> , m_wasCached(false)
</span><del>- , m_connectionID(0)
</del><span class="cx"> , m_connectionReused(false)
</span><span class="cx"> , m_isNull(false)
</span><span class="cx"> , m_haveParsedCacheControlHeader(false)
</span><span class="lines">@@ -84,11 +89,6 @@
</span><span class="cx"> , m_cacheControlContainsNoCache(false)
</span><span class="cx"> , m_cacheControlContainsNoStore(false)
</span><span class="cx"> , m_cacheControlContainsMustRevalidate(false)
</span><del>- , m_cacheControlMaxAge(0.0)
- , m_age(0.0)
- , m_date(0.0)
- , m_expires(0.0)
- , m_lastModified(0.0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.h (162051 => 162052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2014-01-15 06:50:13 UTC (rev 162051)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2014-01-15 06:51:34 UTC (rev 162052)
</span><span class="lines">@@ -145,13 +145,23 @@
</span><span class="cx"> long long m_expectedContentLength;
</span><span class="cx"> String m_textEncodingName;
</span><span class="cx"> String m_suggestedFilename;
</span><del>- int m_httpStatusCode;
</del><span class="cx"> String m_httpStatusText;
</span><span class="cx"> HTTPHeaderMap m_httpHeaderFields;
</span><ins>+ RefPtr<ResourceLoadTiming> m_resourceLoadTiming;
+
+ int m_httpStatusCode;
+ unsigned m_connectionID;
+
+private:
+ mutable double m_cacheControlMaxAge;
+ mutable double m_age;
+ mutable double m_date;
+ mutable double m_expires;
+ mutable double m_lastModified;
+
+public:
</ins><span class="cx"> bool m_wasCached : 1;
</span><del>- unsigned m_connectionID;
</del><span class="cx"> bool m_connectionReused : 1;
</span><del>- RefPtr<ResourceLoadTiming> m_resourceLoadTiming;
</del><span class="cx">
</span><span class="cx"> bool m_isNull : 1;
</span><span class="cx">
</span><span class="lines">@@ -169,12 +179,6 @@
</span><span class="cx"> mutable bool m_cacheControlContainsNoCache : 1;
</span><span class="cx"> mutable bool m_cacheControlContainsNoStore : 1;
</span><span class="cx"> mutable bool m_cacheControlContainsMustRevalidate : 1;
</span><del>- mutable double m_cacheControlMaxAge;
-
- mutable double m_age;
- mutable double m_date;
- mutable double m_expires;
- mutable double m_lastModified;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const ResourceResponse& a, const ResourceResponse& b) { return ResourceResponseBase::compare(a, b); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponse.h (162051 => 162052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2014-01-15 06:50:13 UTC (rev 162051)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2014-01-15 06:51:34 UTC (rev 162052)
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> ResourceResponse(CFURLResponseRef cfResponse)
</span><del>- : m_cfResponse(cfResponse)
- , m_initLevel(Uninitialized)
</del><ins>+ : m_initLevel(Uninitialized)
</ins><span class="cx"> , m_platformResponseIsUpToDate(true)
</span><ins>+ , m_cfResponse(cfResponse)
</ins><span class="cx"> {
</span><span class="cx"> m_isNull = !cfResponse;
</span><span class="cx"> }
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> #else
</span><span class="cx"> ResourceResponse(NSURLResponse *nsResponse)
</span><del>- : m_nsResponse(nsResponse)
- , m_initLevel(Uninitialized)
</del><ins>+ : m_initLevel(Uninitialized)
</ins><span class="cx"> , m_platformResponseIsUpToDate(true)
</span><ins>+ , m_nsResponse(nsResponse)
</ins><span class="cx"> {
</span><span class="cx"> m_isNull = !nsResponse;
</span><span class="cx"> }
</span><span class="lines">@@ -111,6 +111,9 @@
</span><span class="cx">
</span><span class="cx"> static bool platformCompare(const ResourceResponse& a, const ResourceResponse& b);
</span><span class="cx">
</span><ins>+ InitLevel m_initLevel : 3;
+ bool m_platformResponseIsUpToDate : 1;
+
</ins><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> mutable RetainPtr<CFURLResponseRef> m_cfResponse;
</span><span class="cx"> #endif
</span><span class="lines">@@ -121,8 +124,6 @@
</span><span class="cx"> // Certificate chain is normally part of NS/CFURLResponse, but there is no way to re-add it to a deserialized response after IPC.
</span><span class="cx"> RetainPtr<CFArrayRef> m_externalCertificateChain;
</span><span class="cx"> #endif
</span><del>- InitLevel m_initLevel;
- bool m_platformResponseIsUpToDate;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataBase {
</span></span></pre>
</div>
</div>
</body>
</html>