Changeset 141177 in webkit

Timestamp:

Jan 29, 2013 4:22:23 PM (11 years ago)

Author:

andersca@apple.com

Message:

Remove almost everything from MessageID
​https://bugs.webkit.org/show_bug.cgi?id=108244

Reviewed by Beth Dakin.

• Platform/CoreIPC/MessageID.h:

(CoreIPC::MessageID::MessageID):

• Platform/CoreIPC/mac/ConnectionMac.cpp:

(CoreIPC):
(CoreIPC::Connection::sendOutgoingMessage):
(CoreIPC::createMessageDecoder):
(CoreIPC::Connection::receiveSourceEventHandler):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/MessageID.h (modified) (1 diff)
• Platform/CoreIPC/mac/ConnectionMac.cpp (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-29  Anders Carlsson  <andersca@apple.com>
+
+        Remove almost everything from MessageID
+        https://bugs.webkit.org/show_bug.cgi?id=108244
+
+        Reviewed by Beth Dakin.
+
+        * Platform/CoreIPC/MessageID.h:
+        (CoreIPC::MessageID::MessageID):
+        * Platform/CoreIPC/mac/ConnectionMac.cpp:
+        (CoreIPC):
+        (CoreIPC::Connection::sendOutgoingMessage):
+        (CoreIPC::createMessageDecoder):
+        (CoreIPC::Connection::receiveSourceEventHandler):
+
 2013-01-29  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/MessageID.h

@@ -163 +163 @@
 public:
     MessageID()
-        : m_messageID(0)
     {
     }
 
     template <typename EnumType>
-    explicit MessageID(EnumType messageKind, unsigned char flags = 0)
-        : m_messageID(stripMostSignificantBit(flags << 24 | (MessageKindTraits<EnumType>::messageClass) << 16 | messageKind))
+    explicit MessageID(EnumType, unsigned char = 0)
     {
     }
-
-    static MessageID fromInt(unsigned i)
-    {
-        MessageID messageID;
-        messageID.m_messageID = stripMostSignificantBit(i);
-        
-        return messageID;
-    }
-    
-    unsigned toInt() const { return m_messageID; }
-
-private:
-    static inline unsigned stripMostSignificantBit(unsigned value)
-    {
-        return value & 0x7fffffff;
-    }
-
-    MessageClass messageClass() const
-    {
-        return static_cast<MessageClass>(getClass());
-    }
-
-    template <typename EnumType>
-    bool operator==(EnumType messageKind) const
-    {
-        return m_messageID == MessageID(messageKind).m_messageID;
-    }
-
-    unsigned char getFlags() const { return (m_messageID & 0xff000000) >> 24; }
-    unsigned char getClass() const { return (m_messageID & 0x00ff0000) >> 16; }
-
-    unsigned m_messageID;
 };
 

trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp

@@ -44 +44 @@
 static const size_t inlineMessageMaxSize = 4096;
 
+// Message flags.
 enum {
-    MessageBodyIsOOL = 1 << 31
+    MessageBodyIsOutOfLine = 1 << 0
 };
     
@@ -213 +214 @@
     header->msgh_remote_port = m_sendPort;
     header->msgh_local_port = MACH_PORT_NULL;
-    header->msgh_id = messageID.toInt();
+    header->msgh_id = 0;
     if (messageBodyIsOOL)
-        header->msgh_id |= MessageBodyIsOOL;
+        header->msgh_id |= MessageBodyIsOutOfLine;
 
     uint8_t* messageData;
@@ -293 +294 @@
     }
 
-    bool messageBodyIsOOL = header->msgh_id & MessageBodyIsOOL;
+    bool messageBodyIsOOL = header->msgh_id & MessageBodyIsOutOfLine;
 
     mach_msg_body_t* body = reinterpret_cast<mach_msg_body_t*>(header + 1);
@@ -391 +392 @@
         return;
 
-    MessageID messageID = MessageID::fromInt(header->msgh_id);
     OwnPtr<MessageDecoder> decoder = createMessageDecoder(header);
     ASSERT(decoder);
@@ -429 +429 @@
     }
 
-    processIncomingMessage(messageID, decoder.release());
+    processIncomingMessage(MessageID(), decoder.release());
 }