Diff
Modified: trunk/Source/WebKit2/ChangeLog (158943 => 158944)
--- trunk/Source/WebKit2/ChangeLog 2013-11-08 21:01:09 UTC (rev 158943)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-08 21:05:13 UTC (rev 158944)
@@ -1,5 +1,24 @@
2013-11-08 Anders Carlsson <[email protected]>
+ Replace __alignof with alignof.
+
+ Rubber-stamped by Beth Dakin.
+
+ * Platform/CoreIPC/ArgumentCoders.cpp:
+ (CoreIPC::::encode):
+ (CoreIPC::decodeStringText):
+ * Platform/CoreIPC/ArgumentCoders.h:
+ (CoreIPC::SimpleArgumentCoder::encode):
+ (CoreIPC::SimpleArgumentCoder::decode):
+ * Platform/CoreIPC/ArgumentDecoder.h:
+ (CoreIPC::ArgumentDecoder::bufferIsLargeEnoughToContain):
+ * WebProcess/WebPage/DecoderAdapter.cpp:
+ (WebKit::DecoderAdapter::decodeString):
+ * WebProcess/WebPage/EncoderAdapter.cpp:
+ (WebKit::EncoderAdapter::encodeString):
+
+2013-11-08 Anders Carlsson <[email protected]>
+
Add a way to get a WKWebProcessPlugInBrowserContextController from a handle
https://bugs.webkit.org/show_bug.cgi?id=124063
Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp (158943 => 158944)
--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp 2013-11-08 21:01:09 UTC (rev 158943)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp 2013-11-08 21:05:13 UTC (rev 158944)
@@ -102,9 +102,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), alignof(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), alignof(UChar));
}
template <typename CharacterType>
@@ -118,7 +118,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), alignof(CharacterType)))
return false;
result = string;
Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h (158943 => 158944)
--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h 2013-11-08 21:01:09 UTC (rev 158943)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h 2013-11-08 21:05:13 UTC (rev 158944)
@@ -39,12 +39,12 @@
template<typename T> struct SimpleArgumentCoder {
static void encode(ArgumentEncoder& encoder, const T& t)
{
- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(&t), sizeof(T), __alignof(T));
+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(&t), sizeof(T), alignof(T));
}
static bool decode(ArgumentDecoder& decoder, T& t)
{
- return decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(&t), sizeof(T), __alignof(T));
+ return decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(&t), sizeof(T), alignof(T));
}
};
@@ -127,7 +127,7 @@
static void encode(ArgumentEncoder& encoder, const Vector<T>& vector)
{
encoder << static_cast<uint64_t>(vector.size());
- encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(vector.data()), vector.size() * sizeof(T), __alignof(T));
+ encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(vector.data()), vector.size() * sizeof(T), alignof(T));
}
static bool decode(ArgumentDecoder& decoder, Vector<T>& vector)
@@ -147,7 +147,7 @@
Vector<T> 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), alignof(T));
vector.swap(temp);
return true;
Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h (158943 => 158944)
--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h 2013-11-08 21:01:09 UTC (rev 158943)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h 2013-11-08 21:05:13 UTC (rev 158944)
@@ -79,7 +79,7 @@
if (numElements > std::numeric_limits<size_t>::max() / sizeof(T))
return false;
- return bufferIsLargeEnoughToContain(__alignof(T), numElements * sizeof(T));
+ return bufferIsLargeEnoughToContain(alignof(T), numElements * sizeof(T));
}
// Generic type decode function.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp (158943 => 158944)
--- trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp 2013-11-08 21:01:09 UTC (rev 158943)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp 2013-11-08 21:05:13 UTC (rev 158944)
@@ -126,7 +126,7 @@
UChar* buffer;
String string = String::createUninitialized(length, buffer);
- if (!m_decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length * sizeof(UChar), __alignof(UChar)))
+ if (!m_decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length * sizeof(UChar), alignof(UChar)))
return false;
value = string;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp (158943 => 158944)
--- trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp 2013-11-08 21:01:09 UTC (rev 158943)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp 2013-11-08 21:05:13 UTC (rev 158944)
@@ -108,7 +108,7 @@
uint64_t lengthInBytes = length * sizeof(UChar);
m_encoder << lengthInBytes;
- m_encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(value.characters()), length * sizeof(UChar), __alignof(UChar));
+ m_encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(value.characters()), length * sizeof(UChar), alignof(UChar));
}
}
