Changeset 260704 in webkit

Timestamp:

Apr 25, 2020 8:46:47 AM (4 years ago)

Author:

ddkilzer@apple.com

Message:

IPC::Decoder::isInvalid() should be renamed to isValid()
<​https://webkit.org/b/211000>

Reviewed by Darin Adler.

Negative logic is more difficult to reason about than positive
logic.

• Platform/IPC/Connection.cpp:

(IPC::Connection::dispatchMessage):
(IPC::Connection::dispatchWorkQueueMessageReceiverMessage):
(IPC::Connection::dispatchThreadMessageReceiverMessage):
(IPC::Connection::dispatchSyncMessage):

• Platform/IPC/Connection.h:

(IPC::Connection::sendWithAsyncReply):

• Platform/IPC/Decoder.cpp:

(IPC::Decoder::create):

• Platform/IPC/Decoder.h:

(IPC::Decoder::isValid const): Rename from isInvalid()
and invert logic.
(IPC::Decoder::isInvalid const): Rename to isValid().

• Platform/IPC/MessageSender.h:
• UIProcess/AuxiliaryProcessProxy.h:

(WebKit::AuxiliaryProcessProxy::sendWithAsyncReply):

• Change Decoder::isInvalid() to Decoder::isValid() and reverse the Boolean logic.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/IPC/Connection.cpp (modified) (4 diffs)
• Platform/IPC/Connection.h (modified) (1 diff)
• Platform/IPC/Decoder.cpp (modified) (1 diff)
• Platform/IPC/Decoder.h (modified) (1 diff)
• Platform/IPC/MessageSender.h (modified) (1 diff)
• UIProcess/AuxiliaryProcessProxy.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-25  David Kilzer  <ddkilzer@apple.com>
+
+        IPC::Decoder::isInvalid() should be renamed to isValid()
+        <https://webkit.org/b/211000>
+
+        Reviewed by Darin Adler.
+
+        Negative logic is more difficult to reason about than positive
+        logic.
+
+        * Platform/IPC/Connection.cpp:
+        (IPC::Connection::dispatchMessage):
+        (IPC::Connection::dispatchWorkQueueMessageReceiverMessage):
+        (IPC::Connection::dispatchThreadMessageReceiverMessage):
+        (IPC::Connection::dispatchSyncMessage):
+        * Platform/IPC/Connection.h:
+        (IPC::Connection::sendWithAsyncReply):
+        * Platform/IPC/Decoder.cpp:
+        (IPC::Decoder::create):
+        * Platform/IPC/Decoder.h:
+        (IPC::Decoder::isValid const): Rename from isInvalid()
+        and invert logic.
+        (IPC::Decoder::isInvalid const): Rename to isValid().
+        * Platform/IPC/MessageSender.h:
+        * UIProcess/AuxiliaryProcessProxy.h:
+        (WebKit::AuxiliaryProcessProxy::sendWithAsyncReply):
+        - Change Decoder::isInvalid() to Decoder::isValid() and reverse
+          the Boolean logic.
+
 2020-04-25  Diego Pino Garcia  <dpino@igalia.com>
 

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

@@ -356 +356 @@
 
     // FIXME: If the message was invalid, we should send back a SyncMessageError.
-    ASSERT(!decoder.isInvalid());
+    ASSERT(decoder.isValid());
 
     if (replyEncoder)
@@ -400 +400 @@
 
     // FIXME: If the message was invalid, we should send back a SyncMessageError.
-    ASSERT(!decoder.isInvalid());
+    ASSERT(decoder.isValid());
 
     if (replyEncoder)
@@ -931 +931 @@
 
     // FIXME: If the message was invalid, we should send back a SyncMessageError.
-    ASSERT(!decoder.isInvalid());
+    ASSERT(decoder.isValid());
 
     if (replyEncoder)
@@ -1077 +1077 @@
         dispatchMessage(*message);
 
-    m_didReceiveInvalidMessage |= message->isInvalid();
+    m_didReceiveInvalidMessage |= !message->isValid();
     m_inDispatchMessageCount--;
 

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

@@ -484 +484 @@
     sendMessage(WTFMove(encoder), sendOptions);
     addAsyncReplyHandler(*this, listenerID, [completionHandler = WTFMove(completionHandler)] (Decoder* decoder) mutable {
-        if (decoder && !decoder->isInvalid())
+        if (decoder && decoder->isValid())
             T::callReply(*decoder, WTFMove(completionHandler));
         else

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

@@ -49 +49 @@
 {
     auto decoder = makeUnique<Decoder>(buffer, bufferSize, bufferDeallocator, WTFMove(attachments));
-    return decoder->isInvalid() ? nullptr : WTFMove(decoder);
+    return decoder->isValid() ? WTFMove(decoder) : nullptr;
 }
 

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

@@ -72 +72 @@
     size_t length() const { return m_bufferEnd - m_buffer; }
 
-    bool isInvalid() const
+    bool isValid() const
     {
         // (m_bufferPos == m_bufferEnd) is a valid state for decoding if the last parameter
         // is a variable length byte array and its size == 0.
-        return m_bufferPos < m_buffer || m_bufferPos > m_bufferEnd;
+        return m_bufferPos >= m_buffer && m_bufferPos <= m_bufferEnd;
     }
     void markInvalid() { m_bufferPos = nullptr; }

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

@@ -94 +94 @@
         encoder->encode(message.arguments());
         sendMessage(WTFMove(encoder), sendOptions, {{ [completionHandler = WTFMove(completionHandler)] (IPC::Decoder* decoder) mutable {
-            if (decoder && !decoder->isInvalid())
+            if (decoder && decoder->isValid())
                 T::callReply(*decoder, WTFMove(completionHandler));
             else

trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h

@@ -180 +180 @@
     encoder->encode(message.arguments());
     sendMessage(WTFMove(encoder), sendOptions, {{ [completionHandler = WTFMove(completionHandler)] (IPC::Decoder* decoder) mutable {
-        if (decoder && !decoder->isInvalid())
+        if (decoder && decoder->isValid())
             T::callReply(*decoder, WTFMove(completionHandler));
         else