Changeset 176400 in webkit

Timestamp:

Nov 20, 2014 9:43:40 AM (9 years ago)

Author:

Antti Koivisto

Message:

Remove alignment code from cache coders
​https://bugs.webkit.org/show_bug.cgi?id=138927

Failed to land this file.

• NetworkProcess/cache/NetworkCacheCoders.cpp:

(WebKit::NetworkCacheCoder<CString>::encode):
(WebKit::NetworkCacheCoder<CString>::decode):
(WebKit::NetworkCacheCoder<String>::encode):
(WebKit::decodeStringText):
(WebKit::NetworkCacheCoder<WebCore::CertificateInfo>::encode):
(WebKit::NetworkCacheCoder<WebCore::CertificateInfo>::decode):

• NetworkProcess/cache/NetworkCacheCoders.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheCoders.cpp (modified) (6 diffs)
• NetworkProcess/cache/NetworkCacheCoders.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-20  Antti Koivisto  <antti@apple.com>
+
+        Remove alignment code from cache coders
+        https://bugs.webkit.org/show_bug.cgi?id=138927
+
+        Failed to land this file.
+
+        * NetworkProcess/cache/NetworkCacheCoders.cpp:
+        (WebKit::NetworkCacheCoder<CString>::encode):
+        (WebKit::NetworkCacheCoder<CString>::decode):
+        (WebKit::NetworkCacheCoder<String>::encode):
+        (WebKit::decodeStringText):
+        (WebKit::NetworkCacheCoder<WebCore::CertificateInfo>::encode):
+        (WebKit::NetworkCacheCoder<WebCore::CertificateInfo>::decode):
+        * NetworkProcess/cache/NetworkCacheCoders.h:
+
 2014-11-20  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp

@@ -60 +60 @@
     uint32_t length = string.length();
     encoder << length;
-    encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.data()), length, 1);
+    encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.data()), length);
 }
 
@@ -83 +83 @@
     char* buffer;
     CString string = CString::newUninitialized(length, buffer);
-    if (!decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length, 1))
+    if (!decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length))
         return false;
 
@@ -105 +105 @@
 
     if (is8Bit)
-        encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.characters8()), length * sizeof(LChar), alignof(LChar));
+        encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.characters8()), length * sizeof(LChar));
     else
-        encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.characters16()), length * sizeof(UChar), alignof(UChar));
+        encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(string.characters16()), length * sizeof(UChar));
 }
 
@@ -121 +121 @@
     CharacterType* buffer;
     String string = String::createUninitialized(length, buffer);
-    if (!decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length * sizeof(CharacterType), alignof(CharacterType)))
+    if (!decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length * sizeof(CharacterType)))
         return false;
     
@@ -155 +155 @@
     argumentEncoder << certificateInfo;
     encoder << static_cast<uint64_t>(argumentEncoder.bufferSize());
-    encoder.encodeFixedLengthData(argumentEncoder.buffer(), argumentEncoder.bufferSize(), 1);
+    encoder.encodeFixedLengthData(argumentEncoder.buffer(), argumentEncoder.bufferSize());
 }
 
@@ -164 +164 @@
         return false;
     Vector<uint8_t> data(certificateSize);
-    if (!decoder.decodeFixedLengthData(data.data(), data.size(), 1))
+    if (!decoder.decodeFixedLengthData(data.data(), data.size()))
         return false;
     IPC::ArgumentDecoder argumentDecoder(data.data(), data.size());

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h

@@ -156 +156 @@
         temp.resize(size);
 
-        decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(temp.data()), size * sizeof(T), alignof(T));
+        decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(temp.data()), size * sizeof(T));
 
         vector.swap(temp);