<!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>[176400] trunk/Source/WebKit2</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/176400">176400</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-11-20 09:43:40 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove alignment code from cache coders
https://bugs.webkit.org/show_bug.cgi?id=138927
Failed to land this file.
* NetworkProcess/cache/NetworkCacheCoders.cpp:
(WebKit::NetworkCacheCoder<CString>::encode):
(WebKit::NetworkCacheCoder<CString>::decode):
(WebKit::NetworkCacheCoder<String>::encode):
(WebKit::decodeStringText):
(WebKit::NetworkCacheCoder<WebCore::CertificateInfo>::encode):
(WebKit::NetworkCacheCoder<WebCore::CertificateInfo>::decode):
* NetworkProcess/cache/NetworkCacheCoders.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheCoderscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheCodersh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176399 => 176400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-20 17:42:58 UTC (rev 176399)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-20 17:43:40 UTC (rev 176400)
</span><span class="lines">@@ -3,6 +3,22 @@
</span><span class="cx"> Remove alignment code from cache coders
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138927
</span><span class="cx">
</span><ins>+ Failed to land this file.
+
+ * NetworkProcess/cache/NetworkCacheCoders.cpp:
+ (WebKit::NetworkCacheCoder<CString>::encode):
+ (WebKit::NetworkCacheCoder<CString>::decode):
+ (WebKit::NetworkCacheCoder<String>::encode):
+ (WebKit::decodeStringText):
+ (WebKit::NetworkCacheCoder<WebCore::CertificateInfo>::encode):
+ (WebKit::NetworkCacheCoder<WebCore::CertificateInfo>::decode):
+ * NetworkProcess/cache/NetworkCacheCoders.h:
+
+2014-11-20 Antti Koivisto <antti@apple.com>
+
+ Remove alignment code from cache coders
+ https://bugs.webkit.org/show_bug.cgi?id=138927
+
</ins><span class="cx"> Reviewed by Anders Carlsson.
</span><span class="cx">
</span><span class="cx"> Alignment code doesn't do anything useful, wastes space and produces wrong results
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp (176399 => 176400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2014-11-20 17:42:58 UTC (rev 176399)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2014-11-20 17:43:40 UTC (rev 176400)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> uint32_t length = string.length();
</span><span class="cx"> encoder << length;
</span><del>- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.data()), length, 1);
</del><ins>+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.data()), length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool NetworkCacheCoder<CString>::decode(NetworkCacheDecoder& decoder, CString& result)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> char* buffer;
</span><span class="cx"> CString string = CString::newUninitialized(length, buffer);
</span><del>- if (!decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length, 1))
</del><ins>+ if (!decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> result = string;
</span><span class="lines">@@ -104,9 +104,9 @@
</span><span class="cx"> encoder << length << is8Bit;
</span><span class="cx">
</span><span class="cx"> if (is8Bit)
</span><del>- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.characters8()), length * sizeof(LChar), alignof(LChar));
</del><ins>+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.characters8()), length * sizeof(LChar));
</ins><span class="cx"> else
</span><del>- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.characters16()), length * sizeof(UChar), alignof(UChar));
</del><ins>+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.characters16()), length * sizeof(UChar));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> CharacterType* buffer;
</span><span class="cx"> String string = String::createUninitialized(length, buffer);
</span><del>- if (!decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length * sizeof(CharacterType), alignof(CharacterType)))
</del><ins>+ if (!decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length * sizeof(CharacterType)))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> result = string;
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> IPC::ArgumentEncoder argumentEncoder;
</span><span class="cx"> argumentEncoder << certificateInfo;
</span><span class="cx"> encoder << static_cast<uint64_t>(argumentEncoder.bufferSize());
</span><del>- encoder.encodeFixedLengthData(argumentEncoder.buffer(), argumentEncoder.bufferSize(), 1);
</del><ins>+ encoder.encodeFixedLengthData(argumentEncoder.buffer(), argumentEncoder.bufferSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool NetworkCacheCoder<WebCore::CertificateInfo>::decode(NetworkCacheDecoder& decoder, WebCore::CertificateInfo& certificateInfo)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> if (!decoder.decode(certificateSize))
</span><span class="cx"> return false;
</span><span class="cx"> Vector<uint8_t> data(certificateSize);
</span><del>- if (!decoder.decodeFixedLengthData(data.data(), data.size(), 1))
</del><ins>+ if (!decoder.decodeFixedLengthData(data.data(), data.size()))
</ins><span class="cx"> return false;
</span><span class="cx"> IPC::ArgumentDecoder argumentDecoder(data.data(), data.size());
</span><span class="cx"> if (!argumentDecoder.decode(certificateInfo)) {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h (176399 => 176400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2014-11-20 17:42:58 UTC (rev 176399)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2014-11-20 17:43:40 UTC (rev 176400)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> Vector<T, inlineCapacity> temp;
</span><span class="cx"> temp.resize(size);
</span><span class="cx">
</span><del>- decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(temp.data()), size * sizeof(T), alignof(T));
</del><ins>+ decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(temp.data()), size * sizeof(T));
</ins><span class="cx">
</span><span class="cx"> vector.swap(temp);
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>