<!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>[176452] 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/176452">176452</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-11-21 09:40:50 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove alignment code from IPC coders
https://bugs.webkit.org/show_bug.cgi?id=138963
Reviewed by Anders Carlsson.
Alignment code achieves nothing except making the messages somewhat bigger.
* Platform/IPC/ArgumentCoders.cpp:
(IPC::ArgumentCoder<CString>::encode):
(IPC::ArgumentCoder<CString>::decode):
(IPC::ArgumentCoder<String>::encode):
(IPC::decodeStringText):
* Platform/IPC/ArgumentCoders.h:
(IPC::SimpleArgumentCoder::encode):
(IPC::SimpleArgumentCoder::decode):
* Platform/IPC/ArgumentDecoder.cpp:
(IPC::ArgumentDecoder::initialize):
(IPC::ArgumentDecoder::bufferIsLargeEnoughToContain):
(IPC::ArgumentDecoder::decodeFixedLengthData):
(IPC::ArgumentDecoder::decodeVariableLengthByteArray):
(IPC::ArgumentDecoder::decodeNumber):
(IPC::ArgumentDecoder::decode):
(IPC::roundUpToAlignment): Deleted.
(IPC::alignedBufferIsLargeEnoughToContain): Deleted.
(IPC::ArgumentDecoder::alignBufferPosition): Deleted.
(IPC::decodeValueFromBuffer): Deleted.
* Platform/IPC/ArgumentDecoder.h:
(IPC::ArgumentDecoder::isInvalid):
(IPC::ArgumentDecoder::markInvalid):
(IPC::ArgumentDecoder::bufferIsLargeEnoughToContain):
* Platform/IPC/ArgumentEncoder.cpp:
(IPC::ArgumentEncoder::ArgumentEncoder):
(IPC::ArgumentEncoder::grow):
(IPC::ArgumentEncoder::encodeFixedLengthData):
(IPC::ArgumentEncoder::encodeVariableLengthByteArray):
(IPC::ArgumentEncoder::encode):
* Platform/IPC/ArgumentEncoder.h:
(IPC::ArgumentEncoder::buffer):
(IPC::ArgumentEncoder::mutableBuffer):
* Platform/IPC/DataReference.cpp:
(IPC::SharedBufferDataReference::encode):
* Platform/IPC/MessageEncoder.cpp:
(IPC::MessageEncoder::setIsSyncMessage):
(IPC::MessageEncoder::setShouldDispatchMessageWhenWaitingForSyncReply):
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::sendOutgoingMessage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentCoderscpp">trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentCodersh">trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentDecodercpp">trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentDecoderh">trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentEncodercpp">trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentEncoderh">trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCDataReferencecpp">trunk/Source/WebKit2/Platform/IPC/DataReference.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageEncodercpp">trunk/Source/WebKit2/Platform/IPC/MessageEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp">trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2014-11-21 Antti Koivisto <antti@apple.com>
+
+ Remove alignment code from IPC coders
+ https://bugs.webkit.org/show_bug.cgi?id=138963
+
+ Reviewed by Anders Carlsson.
+
+ Alignment code achieves nothing except making the messages somewhat bigger.
+
+ * Platform/IPC/ArgumentCoders.cpp:
+ (IPC::ArgumentCoder<CString>::encode):
+ (IPC::ArgumentCoder<CString>::decode):
+ (IPC::ArgumentCoder<String>::encode):
+ (IPC::decodeStringText):
+ * Platform/IPC/ArgumentCoders.h:
+ (IPC::SimpleArgumentCoder::encode):
+ (IPC::SimpleArgumentCoder::decode):
+ * Platform/IPC/ArgumentDecoder.cpp:
+ (IPC::ArgumentDecoder::initialize):
+ (IPC::ArgumentDecoder::bufferIsLargeEnoughToContain):
+ (IPC::ArgumentDecoder::decodeFixedLengthData):
+ (IPC::ArgumentDecoder::decodeVariableLengthByteArray):
+ (IPC::ArgumentDecoder::decodeNumber):
+ (IPC::ArgumentDecoder::decode):
+ (IPC::roundUpToAlignment): Deleted.
+ (IPC::alignedBufferIsLargeEnoughToContain): Deleted.
+ (IPC::ArgumentDecoder::alignBufferPosition): Deleted.
+ (IPC::decodeValueFromBuffer): Deleted.
+ * Platform/IPC/ArgumentDecoder.h:
+ (IPC::ArgumentDecoder::isInvalid):
+ (IPC::ArgumentDecoder::markInvalid):
+ (IPC::ArgumentDecoder::bufferIsLargeEnoughToContain):
+ * Platform/IPC/ArgumentEncoder.cpp:
+ (IPC::ArgumentEncoder::ArgumentEncoder):
+ (IPC::ArgumentEncoder::grow):
+ (IPC::ArgumentEncoder::encodeFixedLengthData):
+ (IPC::ArgumentEncoder::encodeVariableLengthByteArray):
+ (IPC::ArgumentEncoder::encode):
+ * Platform/IPC/ArgumentEncoder.h:
+ (IPC::ArgumentEncoder::buffer):
+ (IPC::ArgumentEncoder::mutableBuffer):
+ * Platform/IPC/DataReference.cpp:
+ (IPC::SharedBufferDataReference::encode):
+ * Platform/IPC/MessageEncoder.cpp:
+ (IPC::MessageEncoder::setIsSyncMessage):
+ (IPC::MessageEncoder::setShouldDispatchMessageWhenWaitingForSyncReply):
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::Connection::sendOutgoingMessage):
+
</ins><span class="cx"> 2014-11-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make memoryCache() return a reference
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -57,7 +57,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 ArgumentCoder<CString>::decode(ArgumentDecoder& decoder, CString& result)
</span><span class="lines">@@ -80,7 +80,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">@@ -102,9 +102,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">@@ -118,7 +118,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></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx"> template<typename T> struct SimpleArgumentCoder {
</span><span class="cx"> static void encode(ArgumentEncoder& encoder, const T& t)
</span><span class="cx"> {
</span><del>- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(&t), sizeof(T), alignof(T));
</del><ins>+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(&t), sizeof(T));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool decode(ArgumentDecoder& decoder, T& t)
</span><span class="cx"> {
</span><del>- return decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(&t), sizeof(T), alignof(T));
</del><ins>+ return decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(&t), sizeof(T));
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> static void encode(ArgumentEncoder& encoder, const Vector<T, inlineCapacity>& vector)
</span><span class="cx"> {
</span><span class="cx"> encoder << static_cast<uint64_t>(vector.size());
</span><del>- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(vector.data()), vector.size() * sizeof(T), alignof(T));
</del><ins>+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(vector.data()), vector.size() * sizeof(T));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool decode(ArgumentDecoder& decoder, Vector<T, inlineCapacity>& vector)
</span><span class="lines">@@ -198,7 +198,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>
<a id="trunkSourceWebKit2PlatformIPCArgumentDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -56,57 +56,30 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline uint8_t* roundUpToAlignment(uint8_t* ptr, unsigned alignment)
-{
- // Assert that the alignment is a power of 2.
- ASSERT(alignment && !(alignment & (alignment - 1)));
-
- uintptr_t alignmentMask = alignment - 1;
- return reinterpret_cast<uint8_t*>((reinterpret_cast<uintptr_t>(ptr) + alignmentMask) & ~alignmentMask);
-}
-
</del><span class="cx"> void ArgumentDecoder::initialize(const uint8_t* buffer, size_t bufferSize)
</span><span class="cx"> {
</span><span class="cx"> m_buffer = static_cast<uint8_t*>(malloc(bufferSize));
</span><span class="cx">
</span><span class="cx"> ASSERT(!(reinterpret_cast<uintptr_t>(m_buffer) % alignof(uint64_t)));
</span><span class="cx">
</span><del>- m_bufferPos = m_buffer;
</del><ins>+ m_bufferPosition = m_buffer;
</ins><span class="cx"> m_bufferEnd = m_buffer + bufferSize;
</span><span class="cx"> memcpy(m_buffer, buffer, bufferSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool alignedBufferIsLargeEnoughToContain(const uint8_t* alignedPosition, const uint8_t* bufferEnd, size_t size)
</del><ins>+bool ArgumentDecoder::bufferIsLargeEnoughToContain(size_t size) const
</ins><span class="cx"> {
</span><del>- return bufferEnd >= alignedPosition && static_cast<size_t>(bufferEnd - alignedPosition) >= size;
</del><ins>+ return m_buffer + size <= m_bufferEnd;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentDecoder::alignBufferPosition(unsigned alignment, size_t size)
</del><ins>+bool ArgumentDecoder::decodeFixedLengthData(uint8_t* data, size_t size)
</ins><span class="cx"> {
</span><del>- uint8_t* alignedPosition = roundUpToAlignment(m_bufferPos, alignment);
- if (!alignedBufferIsLargeEnoughToContain(alignedPosition, m_bufferEnd, size)) {
- // We've walked off the end of this buffer.
- markInvalid();
</del><ins>+ if (!bufferIsLargeEnoughToContain(size))
</ins><span class="cx"> return false;
</span><del>- }
-
- m_bufferPos = alignedPosition;
- return true;
-}
</del><span class="cx">
</span><del>-bool ArgumentDecoder::bufferIsLargeEnoughToContain(unsigned alignment, size_t size) const
-{
- return alignedBufferIsLargeEnoughToContain(roundUpToAlignment(m_bufferPos, alignment), m_bufferEnd, size);
-}
</del><ins>+ memcpy(data, m_bufferPosition, size);
+ m_bufferPosition += size;
</ins><span class="cx">
</span><del>-bool ArgumentDecoder::decodeFixedLengthData(uint8_t* data, size_t size, unsigned alignment)
-{
- if (!alignBufferPosition(alignment, size))
- return false;
-
- memcpy(data, m_bufferPos, size);
- m_bufferPos += size;
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,102 +89,71 @@
</span><span class="cx"> if (!decode(size))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!alignBufferPosition(1, size))
</del><ins>+ if (!bufferIsLargeEnoughToContain(size))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- uint8_t* data = m_bufferPos;
- m_bufferPos += size;
</del><ins>+ uint8_t* data = m_bufferPosition;
+ m_bufferPosition += size;
</ins><span class="cx">
</span><span class="cx"> dataReference = DataReference(data, size);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Type>
</span><del>-static void decodeValueFromBuffer(Type& value, uint8_t*& bufferPosition)
</del><ins>+bool ArgumentDecoder::decodeNumber(Type& value)
</ins><span class="cx"> {
</span><del>- memcpy(&value, bufferPosition, sizeof(value));
- bufferPosition += sizeof(Type);
</del><ins>+ if (!bufferIsLargeEnoughToContain(sizeof(Type)))
+ return false;
+
+ memcpy(&value, m_bufferPosition, sizeof(Type));
+ m_bufferPosition += sizeof(Type);
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(bool& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(uint8_t& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(uint16_t& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(uint32_t& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(uint64_t& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(int32_t& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(int64_t& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(float& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::decode(double& result)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
</del><ins>+ return decodeNumber(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentDecoder::removeAttachment(Attachment& attachment)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.h (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.h 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.h 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx">
</span><span class="cx"> size_t length() const { return m_bufferEnd - m_buffer; }
</span><span class="cx">
</span><del>- bool isInvalid() const { return m_bufferPos > m_bufferEnd; }
- void markInvalid() { m_bufferPos = m_bufferEnd + 1; }
</del><ins>+ bool isInvalid() const { return m_bufferPosition > m_bufferEnd; }
+ void markInvalid() { m_bufferPosition = m_bufferEnd + 1; }
</ins><span class="cx">
</span><del>- bool decodeFixedLengthData(uint8_t*, size_t, unsigned alignment);
</del><ins>+ bool decodeFixedLengthData(uint8_t*, size_t);
</ins><span class="cx">
</span><span class="cx"> // The data in the data reference here will only be valid for the lifetime of the ArgumentDecoder object.
</span><span class="cx"> bool decodeVariableLengthByteArray(DataReference&);
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> if (numElements > std::numeric_limits<size_t>::max() / sizeof(T))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return bufferIsLargeEnoughToContain(alignof(T), numElements * sizeof(T));
</del><ins>+ return bufferIsLargeEnoughToContain(numElements * sizeof(T));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Generic type decode function.
</span><span class="lines">@@ -96,12 +96,12 @@
</span><span class="cx">
</span><span class="cx"> void initialize(const uint8_t* buffer, size_t bufferSize);
</span><span class="cx">
</span><del>- bool alignBufferPosition(unsigned alignment, size_t size);
- bool bufferIsLargeEnoughToContain(unsigned alignment, size_t size) const;
</del><ins>+ bool bufferIsLargeEnoughToContain(size_t) const;
+ template <typename Type> bool decodeNumber(Type& value);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> uint8_t* m_buffer;
</span><del>- uint8_t* m_bufferPos;
</del><ins>+ uint8_t* m_bufferPosition;
</ins><span class="cx"> uint8_t* m_bufferEnd;
</span><span class="cx">
</span><span class="cx"> Vector<Attachment> m_attachments;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx">
</span><span class="cx"> ArgumentEncoder::ArgumentEncoder()
</span><span class="cx"> : m_buffer(m_inlineBuffer)
</span><del>- , m_bufferPointer(m_inlineBuffer)
</del><span class="cx"> , m_bufferSize(0)
</span><span class="cx"> , m_bufferCapacity(sizeof(m_inlineBuffer))
</span><span class="cx"> {
</span><span class="lines">@@ -103,89 +102,78 @@
</span><span class="cx"> m_bufferCapacity = newCapacity;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint8_t* ArgumentEncoder::grow(unsigned alignment, size_t size)
</del><ins>+uint8_t* ArgumentEncoder::grow(size_t size)
</ins><span class="cx"> {
</span><del>- size_t alignedSize = roundUpToAlignment(m_bufferSize, alignment);
- reserve(alignedSize + size);
</del><ins>+ size_t position = m_bufferSize;
+ reserve(m_bufferSize + size);
</ins><span class="cx">
</span><del>- m_bufferSize = alignedSize + size;
- m_bufferPointer = m_buffer + alignedSize + size;
-
- return m_buffer + alignedSize;
</del><ins>+ m_bufferSize += size;
+
+ return m_buffer + position;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encodeFixedLengthData(const uint8_t* data, size_t size, unsigned alignment)
</del><ins>+void ArgumentEncoder::encodeFixedLengthData(const uint8_t* data, size_t size)
</ins><span class="cx"> {
</span><del>- ASSERT(!(reinterpret_cast<uintptr_t>(data) % alignment));
-
- uint8_t* buffer = grow(alignment, size);
</del><ins>+ uint8_t* buffer = grow(size);
</ins><span class="cx"> memcpy(buffer, data, size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ArgumentEncoder::encodeVariableLengthByteArray(const DataReference& dataReference)
</span><span class="cx"> {
</span><span class="cx"> encode(static_cast<uint64_t>(dataReference.size()));
</span><del>- encodeFixedLengthData(dataReference.data(), dataReference.size(), 1);
</del><ins>+ encodeFixedLengthData(dataReference.data(), dataReference.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Type>
</span><del>-static void copyValueToBuffer(Type value, uint8_t* bufferPosition)
</del><ins>+void ArgumentEncoder::encodeNumber(Type value)
</ins><span class="cx"> {
</span><ins>+ uint8_t* bufferPosition = grow(sizeof(Type));
</ins><span class="cx"> memcpy(bufferPosition, &value, sizeof(Type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(bool n)
</del><ins>+void ArgumentEncoder::encode(bool value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(uint8_t n)
</del><ins>+void ArgumentEncoder::encode(uint8_t value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(uint16_t n)
</del><ins>+void ArgumentEncoder::encode(uint16_t value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(uint32_t n)
</del><ins>+void ArgumentEncoder::encode(uint32_t value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(uint64_t n)
</del><ins>+void ArgumentEncoder::encode(uint64_t value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(int32_t n)
</del><ins>+void ArgumentEncoder::encode(int32_t value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(int64_t n)
</del><ins>+void ArgumentEncoder::encode(int64_t value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(float n)
</del><ins>+void ArgumentEncoder::encode(float value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(double n)
</del><ins>+void ArgumentEncoder::encode(double value)
</ins><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
</del><ins>+ encodeNumber(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ArgumentEncoder::addAttachment(const Attachment& attachment)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> ArgumentEncoder();
</span><span class="cx"> virtual ~ArgumentEncoder();
</span><span class="cx">
</span><del>- void encodeFixedLengthData(const uint8_t*, size_t, unsigned alignment);
</del><ins>+ void encodeFixedLengthData(const uint8_t*, size_t);
</ins><span class="cx"> void encodeVariableLengthByteArray(const DataReference&);
</span><span class="cx">
</span><span class="cx"> template<typename T> void encodeEnum(T t)
</span><span class="lines">@@ -62,13 +62,16 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint8_t* buffer() const { return m_buffer; }
</del><ins>+ const uint8_t* buffer() const { return m_buffer; }
</ins><span class="cx"> size_t bufferSize() const { return m_bufferSize; }
</span><span class="cx">
</span><span class="cx"> void addAttachment(const Attachment&);
</span><span class="cx"> Vector<Attachment> releaseAttachments();
</span><span class="cx"> void reserve(size_t);
</span><span class="cx">
</span><ins>+protected:
+ uint8_t* mutableBuffer() { return m_buffer; }
+
</ins><span class="cx"> private:
</span><span class="cx"> void encode(bool);
</span><span class="cx"> void encode(uint8_t);
</span><span class="lines">@@ -79,14 +82,13 @@
</span><span class="cx"> void encode(int64_t);
</span><span class="cx"> void encode(float);
</span><span class="cx"> void encode(double);
</span><ins>+ template<typename Type> void encodeNumber(Type);
</ins><span class="cx">
</span><del>- uint8_t* grow(unsigned alignment, size_t size);
</del><ins>+ uint8_t* grow(size_t);
</ins><span class="cx">
</span><span class="cx"> uint8_t m_inlineBuffer[512];
</span><ins>+ uint8_t* m_buffer;
</ins><span class="cx">
</span><del>- uint8_t* m_buffer;
- uint8_t* m_bufferPointer;
-
</del><span class="cx"> size_t m_bufferSize;
</span><span class="cx"> size_t m_bufferCapacity;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCDataReferencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/DataReference.cpp (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/DataReference.cpp 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/DataReference.cpp 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> unsigned position = 0;
</span><span class="cx"> while (position < bufferSize) {
</span><span class="cx"> unsigned bytesToWrite = m_buffer->getSomeData(partialData, position);
</span><del>- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(partialData), bytesToWrite, 1);
</del><ins>+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(partialData), bytesToWrite);
</ins><span class="cx"> position += bytesToWrite;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageEncoder.cpp (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageEncoder.cpp 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/MessageEncoder.cpp 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -51,17 +51,17 @@
</span><span class="cx"> void MessageEncoder::setIsSyncMessage(bool isSyncMessage)
</span><span class="cx"> {
</span><span class="cx"> if (isSyncMessage)
</span><del>- *buffer() |= SyncMessage;
</del><ins>+ *mutableBuffer() |= SyncMessage;
</ins><span class="cx"> else
</span><del>- *buffer() &= ~SyncMessage;
</del><ins>+ *mutableBuffer() &= ~SyncMessage;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MessageEncoder::setShouldDispatchMessageWhenWaitingForSyncReply(bool shouldDispatchMessageWhenWaitingForSyncReply)
</span><span class="cx"> {
</span><span class="cx"> if (shouldDispatchMessageWhenWaitingForSyncReply)
</span><del>- *buffer() |= DispatchMessageWhenWaitingForSyncReply;
</del><ins>+ *mutableBuffer() |= DispatchMessageWhenWaitingForSyncReply;
</ins><span class="cx"> else
</span><del>- *buffer() &= ~DispatchMessageWhenWaitingForSyncReply;
</del><ins>+ *mutableBuffer() &= ~DispatchMessageWhenWaitingForSyncReply;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> if (messageBodyIsOOL) {
</span><span class="cx"> mach_msg_descriptor_t* descriptor = reinterpret_cast<mach_msg_descriptor_t*>(descriptorData);
</span><span class="cx">
</span><del>- descriptor->out_of_line.address = encoder->buffer();
</del><ins>+ descriptor->out_of_line.address = const_cast<uint8_t*>(encoder->buffer());
</ins><span class="cx"> descriptor->out_of_line.size = encoder->bufferSize();
</span><span class="cx"> descriptor->out_of_line.copy = MACH_MSG_VIRTUAL_COPY;
</span><span class="cx"> descriptor->out_of_line.deallocate = false;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (176451 => 176452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2014-11-21 17:05:19 UTC (rev 176451)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2014-11-21 17:40:50 UTC (rev 176452)
</span><span class="lines">@@ -514,7 +514,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!messageInfo.isMessageBodyIsOutOfLine() && encoder->bufferSize()) {
</span><del>- iov[iovLength].iov_base = reinterpret_cast<void*>(encoder->buffer());
</del><ins>+ iov[iovLength].iov_base = reinterpret_cast<void*>(const_cast<uint8_t*>(encoder->buffer()));
</ins><span class="cx"> iov[iovLength].iov_len = encoder->bufferSize();
</span><span class="cx"> ++iovLength;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>