Title: [235593] releases/WebKitGTK/webkit-2.22/Source/WebKit
Revision
235593
Author
[email protected]
Date
2018-09-03 01:29:30 -0700 (Mon, 03 Sep 2018)

Log Message

Merge r235499 - [ConnectionUnix] Shrink sizeof AttachmentInfo by reordering members
https://bugs.webkit.org/show_bug.cgi?id=189149

Reviewed by Michael Catanzaro.

Reorder members to shrink the size of AttachmentInfo so that
we can attach more attachments.

* Platform/IPC/unix/ConnectionUnix.cpp:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (235592 => 235593)


--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog	2018-09-03 08:29:23 UTC (rev 235592)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog	2018-09-03 08:29:30 UTC (rev 235593)
@@ -1,3 +1,15 @@
+2018-08-30  Yoshiaki Jitsukawa  <[email protected]>
+
+        [ConnectionUnix] Shrink sizeof AttachmentInfo by reordering members
+        https://bugs.webkit.org/show_bug.cgi?id=189149
+
+        Reviewed by Michael Catanzaro.
+
+        Reorder members to shrink the size of AttachmentInfo so that
+        we can attach more attachments. 
+
+        * Platform/IPC/unix/ConnectionUnix.cpp:
+
 2018-08-24  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.21.92 release.

Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp (235592 => 235593)


--- releases/WebKitGTK/webkit-2.22/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp	2018-09-03 08:29:23 UTC (rev 235592)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp	2018-09-03 08:29:30 UTC (rev 235593)
@@ -59,7 +59,7 @@
 namespace IPC {
 
 static const size_t messageMaxSize = 4096;
-static const size_t attachmentMaxAmount = 255;
+static const size_t attachmentMaxAmount = 254;
 
 class AttachmentInfo {
     WTF_MAKE_FAST_ALLOCATED;
@@ -86,10 +86,12 @@
 
 private:
     Attachment::Type m_type { Attachment::Uninitialized };
+    bool m_isNull { false };
     size_t m_size { 0 };
-    bool m_isNull { false };
 };
 
+static_assert(sizeof(MessageInfo) + sizeof(AttachmentInfo) * attachmentMaxAmount <= messageMaxSize, "messageMaxSize is too small.");
+
 void Connection::platformInitialize(Identifier identifier)
 {
     m_socketDescriptor = identifier;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to