Changeset 88853 in webkit

Timestamp:

Jun 14, 2011 2:39:32 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-06-14 Anders Carlsson <​andersca@apple.com>

Reviewed by Darin Adler.

Add functions for encoding/decoding data with a known size and alignment
​https://bugs.webkit.org/show_bug.cgi?id=62663

• Platform/CoreIPC/ArgumentDecoder.cpp: (CoreIPC::ArgumentDecoder::decodeFixedLengthData):
• Platform/CoreIPC/ArgumentDecoder.h:
• Platform/CoreIPC/ArgumentEncoder.cpp: (CoreIPC::ArgumentEncoder::encodeFixedLengthData): (CoreIPC::ArgumentEncoder::encodeVariableLengthData):
• Platform/CoreIPC/ArgumentEncoder.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/ArgumentDecoder.cpp (modified) (1 diff)
• Platform/CoreIPC/ArgumentDecoder.h (modified) (1 diff)
• Platform/CoreIPC/ArgumentEncoder.cpp (modified) (1 diff)
• Platform/CoreIPC/ArgumentEncoder.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-14  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Add functions for encoding/decoding data with a known size and alignment
+        https://bugs.webkit.org/show_bug.cgi?id=62663
+
+        * Platform/CoreIPC/ArgumentDecoder.cpp:
+        (CoreIPC::ArgumentDecoder::decodeFixedLengthData):
+        * Platform/CoreIPC/ArgumentDecoder.h:
+        * Platform/CoreIPC/ArgumentEncoder.cpp:
+        (CoreIPC::ArgumentEncoder::encodeFixedLengthData):
+        (CoreIPC::ArgumentEncoder::encodeVariableLengthData):
+        * Platform/CoreIPC/ArgumentEncoder.h:
+
 2011-06-14  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp

@@ -103 +103 @@
 }
 
+bool ArgumentDecoder::decodeFixedLengthData(uint8_t* data, size_t size, unsigned alignment)
+{
+    if (!alignBufferPosition(size, alignment))
+        return false;
+
+    memcpy(data, m_bufferPos, size);
+    m_bufferPos += size;
+
+    return true;
+}
+
 bool ArgumentDecoder::decodeBytes(Vector<uint8_t>& buffer)
 {

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

@@ -47 +47 @@
     bool isInvalid() const { return m_bufferPos > m_bufferEnd; }
     void markInvalid() { m_bufferPos = m_bufferEnd + 1; }
+
+    bool decodeFixedLengthData(uint8_t*, size_t, unsigned alignment);
 
     bool decodeBytes(Vector<uint8_t>&);

trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp

@@ -86 +86 @@
 }
 
+void ArgumentEncoder::encodeFixedLengthData(const uint8_t* data, size_t size, unsigned alignment)
+{
+    uint8_t* buffer = grow(alignment, size);
+    memcpy(buffer, data, size);
+}
+
+void ArgumentEncoder::encodeVariableLengthData(const uint8_t* data, size_t size, unsigned alignment)
+{
+    // Encode the size.
+    encodeUInt64(static_cast<uint64_t>(size));
+
+    // Encode the data.
+    encodeFixedLengthData(data, size, alignment);
+}
+
 void ArgumentEncoder::encodeBytes(const uint8_t* bytes, size_t size)
 {

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

@@ -41 +41 @@
     static PassOwnPtr<ArgumentEncoder> create(uint64_t destinationID);
     ~ArgumentEncoder();
+
+    void encodeFixedLengthData(const uint8_t*, size_t, unsigned alignment);
+    void encodeVariableLengthData(const uint8_t*, size_t, unsigned alignment);
 
     void encodeBytes(const uint8_t*, size_t);