Changeset 285818 in webkit

Timestamp:

Nov 15, 2021, 11:19:52 AM (5 years ago)

Author:

Chris Dumez

Message:

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/IPC/Decoder.cpp (modified) (1 diff)
• Platform/IPC/Decoder.h (modified) (2 diffs)
• Platform/IPC/Encoder.cpp (modified) (1 diff)
• Platform/IPC/Encoder.h (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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:
+
 2021-11-15  Per Arne Vollan <pvollan@apple.com>
 

trunk/Source/WebKit/Platform/IPC/Decoder.cpp

@@ -95 +95 @@
 }
 
-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();
-}
-
 Decoder::Decoder(const uint8_t* stream, size_t streamSize, uint64_t destinationID)
     : m_buffer { stream }

trunk/Source/WebKit/Platform/IPC/Decoder.h

@@ -60 +60 @@
     Decoder(const Decoder&) = delete;
     Decoder(Decoder&&) = delete;
+    Decoder& operator=(const Decoder&) = delete;
+    Decoder& operator=(Decoder&&) = delete;
 
     ReceiverName messageReceiverName() const { return receiverName(m_messageName); }
@@ -141 +143 @@
     bool removeAttachment(Attachment&);
 
-    static const bool isIPCDecoder = true;
-
-    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;
-    }
+    static constexpr bool isIPCDecoder = true;
 
 private:
     Decoder(const uint8_t* buffer, size_t bufferSize, void (*bufferDeallocator)(const uint8_t*, size_t), Vector<Attachment>&&);
-
-    enum ConstructWithoutHeaderTag { ConstructWithoutHeader };
-    Decoder(const uint8_t* buffer, size_t bufferSize, ConstructWithoutHeaderTag);
 
     bool alignBufferPosition(size_t alignment, size_t);

trunk/Source/WebKit/Platform/IPC/Encoder.cpp

@@ -67 +67 @@
     : m_messageName(messageName)
     , m_destinationID(destinationID)
-    , m_buffer(m_inlineBuffer)
-    , m_bufferPointer(m_inlineBuffer)
-    , m_bufferSize(0)
-    , m_bufferCapacity(sizeof(m_inlineBuffer))
 {
     encodeHeader();
-}
-
-Encoder::Encoder(ConstructWithoutHeaderTag)
-    : m_messageName()
-    , m_destinationID(0)
-    , m_buffer(m_inlineBuffer)
-    , m_bufferPointer(m_inlineBuffer)
-    , m_bufferSize(0)
-    , m_bufferCapacity(sizeof(m_inlineBuffer))
-{
 }
 

trunk/Source/WebKit/Platform/IPC/Encoder.h

@@ -47 +47 @@
     ~Encoder();
 
+    Encoder(const Encoder&) = delete;
+    Encoder(Encoder&&) = delete;
+    Encoder& operator=(const Encoder&) = delete;
+    Encoder& operator=(Encoder&&) = delete;
+
     ReceiverName messageReceiverName() const { return receiverName(m_messageName); }
     MessageName messageName() const { return m_messageName; }
@@ -77 +82 @@
     void reserve(size_t);
 
-    static const bool isIPCEncoder = true;
-
-    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());
-    }
+    static constexpr bool isIPCEncoder = true;
 
 private:
-    enum ConstructWithoutHeaderTag { ConstructWithoutHeader };
-    Encoder(ConstructWithoutHeaderTag);
-
     uint8_t* grow(size_t alignment, size_t);
 
@@ -110 +98 @@
     uint8_t m_inlineBuffer[512];
 
-    uint8_t* m_buffer;
-    uint8_t* m_bufferPointer;
+    uint8_t* m_buffer { m_inlineBuffer };
+    uint8_t* m_bufferPointer { m_inlineBuffer };
     
-    size_t m_bufferSize;
-    size_t m_bufferCapacity;
+    size_t m_bufferSize { 0 };
+    size_t m_bufferCapacity { sizeof(m_inlineBuffer) };
 
     Vector<Attachment> m_attachments;