<!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>[285818] trunk/Source/WebKit</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/285818">285818</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-11-15 11:19:52 -0800 (Mon, 15 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove some dead code from IPC::Encoder / IPC::Decoder
https://bugs.webkit.org/show_bug.cgi?id=233134

Reviewed by Sam Weinig.

Remove some dead code from IPC::Encoder / IPC::Decoder and make sure both
types are non-copyable / non-movable.

* Platform/IPC/Decoder.cpp:
* Platform/IPC/Decoder.h:
(IPC::Decoder::decodeSingleObject): Deleted.
(): Deleted.
* Platform/IPC/Encoder.cpp:
(IPC::Encoder::Encoder):
* Platform/IPC/Encoder.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformIPCDecodercpp">trunk/Source/WebKit/Platform/IPC/Decoder.cpp</a></li>
<li><a href="#trunkSourceWebKitPlatformIPCDecoderh">trunk/Source/WebKit/Platform/IPC/Decoder.h</a></li>
<li><a href="#trunkSourceWebKitPlatformIPCEncodercpp">trunk/Source/WebKit/Platform/IPC/Encoder.cpp</a></li>
<li><a href="#trunkSourceWebKitPlatformIPCEncoderh">trunk/Source/WebKit/Platform/IPC/Encoder.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (285817 => 285818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-11-15 19:15:42 UTC (rev 285817)
+++ trunk/Source/WebKit/ChangeLog       2021-11-15 19:19:52 UTC (rev 285818)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-11-15  Chris Dumez  <cdumez@apple.com>
+
+        Remove some dead code from IPC::Encoder / IPC::Decoder
+        https://bugs.webkit.org/show_bug.cgi?id=233134
+
+        Reviewed by Sam Weinig.
+
+        Remove some dead code from IPC::Encoder / IPC::Decoder and make sure both
+        types are non-copyable / non-movable.
+
+        * Platform/IPC/Decoder.cpp:
+        * Platform/IPC/Decoder.h:
+        (IPC::Decoder::decodeSingleObject): Deleted.
+        (): Deleted.
+        * Platform/IPC/Encoder.cpp:
+        (IPC::Encoder::Encoder):
+        * Platform/IPC/Encoder.h:
+
</ins><span class="cx"> 2021-11-15  Per Arne Vollan <pvollan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS][GPUP] Add telemetry for syscalls
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformIPCDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/IPC/Decoder.cpp (285817 => 285818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/IPC/Decoder.cpp     2021-11-15 19:15:42 UTC (rev 285817)
+++ trunk/Source/WebKit/Platform/IPC/Decoder.cpp        2021-11-15 19:19:52 UTC (rev 285818)
</span><span class="lines">@@ -94,16 +94,6 @@
</span><span class="cx">         return;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Decoder::Decoder(const uint8_t* buffer, size_t bufferSize, ConstructWithoutHeaderTag)
-    : m_buffer { buffer }
-    , m_bufferPos { m_buffer }
-    , m_bufferEnd { m_buffer + bufferSize }
-    , m_bufferDeallocator([] (const uint8_t*, size_t) { })
-{
-    if (UNLIKELY(reinterpret_cast<uintptr_t>(m_buffer) % alignof(uint64_t)))
-        markInvalid();
-}
-
</del><span class="cx"> Decoder::Decoder(const uint8_t* stream, size_t streamSize, uint64_t destinationID)
</span><span class="cx">     : m_buffer { stream }
</span><span class="cx">     , m_bufferPos { m_buffer }
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformIPCDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/IPC/Decoder.h (285817 => 285818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/IPC/Decoder.h       2021-11-15 19:15:42 UTC (rev 285817)
+++ trunk/Source/WebKit/Platform/IPC/Decoder.h  2021-11-15 19:19:52 UTC (rev 285818)
</span><span class="lines">@@ -59,6 +59,8 @@
</span><span class="cx"> 
</span><span class="cx">     Decoder(const Decoder&) = delete;
</span><span class="cx">     Decoder(Decoder&&) = delete;
</span><ins>+    Decoder& operator=(const Decoder&) = delete;
+    Decoder& operator=(Decoder&&) = delete;
</ins><span class="cx"> 
</span><span class="cx">     ReceiverName messageReceiverName() const { return receiverName(m_messageName); }
</span><span class="cx">     MessageName messageName() const { return m_messageName; }
</span><span class="lines">@@ -140,26 +142,11 @@
</span><span class="cx"> 
</span><span class="cx">     bool removeAttachment(Attachment&);
</span><span class="cx"> 
</span><del>-    static const bool isIPCDecoder = true;
</del><ins>+    static constexpr bool isIPCDecoder = true;
</ins><span class="cx"> 
</span><del>-    template <typename T>
-    static std::optional<T> decodeSingleObject(const uint8_t* source, size_t numberOfBytes)
-    {
-        std::optional<T> result;
-        Decoder decoder(source, numberOfBytes, ConstructWithoutHeader);
-        if (!decoder.isValid())
-            return std::nullopt;
-
-        decoder >> result;
-        return result;
-    }
-
</del><span class="cx"> private:
</span><span class="cx">     Decoder(const uint8_t* buffer, size_t bufferSize, void (*bufferDeallocator)(const uint8_t*, size_t), Vector<Attachment>&&);
</span><span class="cx"> 
</span><del>-    enum ConstructWithoutHeaderTag { ConstructWithoutHeader };
-    Decoder(const uint8_t* buffer, size_t bufferSize, ConstructWithoutHeaderTag);
-
</del><span class="cx">     bool alignBufferPosition(size_t alignment, size_t);
</span><span class="cx">     bool bufferIsLargeEnoughToContain(size_t alignment, size_t) const;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformIPCEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/IPC/Encoder.cpp (285817 => 285818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/IPC/Encoder.cpp     2021-11-15 19:15:42 UTC (rev 285817)
+++ trunk/Source/WebKit/Platform/IPC/Encoder.cpp        2021-11-15 19:19:52 UTC (rev 285818)
</span><span class="lines">@@ -66,24 +66,10 @@
</span><span class="cx"> Encoder::Encoder(MessageName messageName, uint64_t destinationID)
</span><span class="cx">     : m_messageName(messageName)
</span><span class="cx">     , m_destinationID(destinationID)
</span><del>-    , m_buffer(m_inlineBuffer)
-    , m_bufferPointer(m_inlineBuffer)
-    , m_bufferSize(0)
-    , m_bufferCapacity(sizeof(m_inlineBuffer))
</del><span class="cx"> {
</span><span class="cx">     encodeHeader();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Encoder::Encoder(ConstructWithoutHeaderTag)
-    : m_messageName()
-    , m_destinationID(0)
-    , m_buffer(m_inlineBuffer)
-    , m_bufferPointer(m_inlineBuffer)
-    , m_bufferSize(0)
-    , m_bufferCapacity(sizeof(m_inlineBuffer))
-{
-}
-
</del><span class="cx"> Encoder::~Encoder()
</span><span class="cx"> {
</span><span class="cx">     if (m_buffer != m_inlineBuffer)
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformIPCEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/IPC/Encoder.h (285817 => 285818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/IPC/Encoder.h       2021-11-15 19:15:42 UTC (rev 285817)
+++ trunk/Source/WebKit/Platform/IPC/Encoder.h  2021-11-15 19:19:52 UTC (rev 285818)
</span><span class="lines">@@ -46,6 +46,11 @@
</span><span class="cx">     Encoder(MessageName, uint64_t destinationID);
</span><span class="cx">     ~Encoder();
</span><span class="cx"> 
</span><ins>+    Encoder(const Encoder&) = delete;
+    Encoder(Encoder&&) = delete;
+    Encoder& operator=(const Encoder&) = delete;
+    Encoder& operator=(Encoder&&) = delete;
+
</ins><span class="cx">     ReceiverName messageReceiverName() const { return receiverName(m_messageName); }
</span><span class="cx">     MessageName messageName() const { return m_messageName; }
</span><span class="cx">     uint64_t destinationID() const { return m_destinationID; }
</span><span class="lines">@@ -76,26 +81,9 @@
</span><span class="cx">     Vector<Attachment> releaseAttachments();
</span><span class="cx">     void reserve(size_t);
</span><span class="cx"> 
</span><del>-    static const bool isIPCEncoder = true;
</del><ins>+    static constexpr bool isIPCEncoder = true;
</ins><span class="cx"> 
</span><del>-    template<typename T>
-    static RefPtr<WebCore::SharedBuffer> encodeSingleObject(const T& object)
-    {
-        Encoder encoder(ConstructWithoutHeader);
-        encoder << object;
-
-        if (encoder.hasAttachments()) {
-            ASSERT_NOT_REACHED();
-            return nullptr;
-        }
-
-        return WebCore::SharedBuffer::create(encoder.buffer(), encoder.bufferSize());
-    }
-
</del><span class="cx"> private:
</span><del>-    enum ConstructWithoutHeaderTag { ConstructWithoutHeader };
-    Encoder(ConstructWithoutHeaderTag);
-
</del><span class="cx">     uint8_t* grow(size_t alignment, size_t);
</span><span class="cx"> 
</span><span class="cx">     bool hasAttachments() const;
</span><span class="lines">@@ -109,11 +97,11 @@
</span><span class="cx"> 
</span><span class="cx">     uint8_t m_inlineBuffer[512];
</span><span class="cx"> 
</span><del>-    uint8_t* m_buffer;
-    uint8_t* m_bufferPointer;
</del><ins>+    uint8_t* m_buffer { m_inlineBuffer };
+    uint8_t* m_bufferPointer { m_inlineBuffer };
</ins><span class="cx">     
</span><del>-    size_t m_bufferSize;
-    size_t m_bufferCapacity;
</del><ins>+    size_t m_bufferSize { 0 };
+    size_t m_bufferCapacity { sizeof(m_inlineBuffer) };
</ins><span class="cx"> 
</span><span class="cx">     Vector<Attachment> m_attachments;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>