Modified: trunk/Source/WebKit2/ChangeLog (176399 => 176400)
--- trunk/Source/WebKit2/ChangeLog 2014-11-20 17:42:58 UTC (rev 176399)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-20 17:43:40 UTC (rev 176400)
@@ -3,6 +3,22 @@
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 <[email protected]>
+
+ Remove alignment code from cache coders
+ https://bugs.webkit.org/show_bug.cgi?id=138927
+
Reviewed by Anders Carlsson.
Alignment code doesn't do anything useful, wastes space and produces wrong results
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp (176399 => 176400)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2014-11-20 17:42:58 UTC (rev 176399)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.cpp 2014-11-20 17:43:40 UTC (rev 176400)
@@ -59,7 +59,7 @@
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);
}
bool NetworkCacheCoder<CString>::decode(NetworkCacheDecoder& decoder, CString& result)
@@ -82,7 +82,7 @@
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;
result = string;
@@ -104,9 +104,9 @@
encoder << length << is8Bit;
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));
}
template <typename CharacterType>
@@ -120,7 +120,7 @@
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;
result = string;
@@ -154,7 +154,7 @@
IPC::ArgumentEncoder argumentEncoder;
argumentEncoder << certificateInfo;
encoder << static_cast<uint64_t>(argumentEncoder.bufferSize());
- encoder.encodeFixedLengthData(argumentEncoder.buffer(), argumentEncoder.bufferSize(), 1);
+ encoder.encodeFixedLengthData(argumentEncoder.buffer(), argumentEncoder.bufferSize());
}
bool NetworkCacheCoder<WebCore::CertificateInfo>::decode(NetworkCacheDecoder& decoder, WebCore::CertificateInfo& certificateInfo)
@@ -163,7 +163,7 @@
if (!decoder.decode(certificateSize))
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());
if (!argumentDecoder.decode(certificateInfo)) {
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h (176399 => 176400)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2014-11-20 17:42:58 UTC (rev 176399)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h 2014-11-20 17:43:40 UTC (rev 176400)
@@ -155,7 +155,7 @@
Vector<T, inlineCapacity> temp;
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);
return true;
