Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp
index ed6dc210e..61b9e8265 100644
--- a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp
@@ -37,7 +37,7 @@ EncoderAdapter::EncoderAdapter()
 {
     // Keep format compatibility by decoding an unused uint64_t value
     // that used to be encoded by the argument encoder.
-    m_encoder->encode(static_cast<uint64_t>(0));
+    *m_encoder << static_cast<uint64_t>(0);
 }
 
 CoreIPC::DataReference EncoderAdapter::dataReference() const
@@ -47,47 +47,47 @@ CoreIPC::DataReference EncoderAdapter::dataReference() const
 
 void EncoderAdapter::encodeBytes(const uint8_t* bytes, size_t size)
 {
-    m_encoder->encode(CoreIPC::DataReference(bytes, size));
+    *m_encoder << CoreIPC::DataReference(bytes, size);
 }
 
 void EncoderAdapter::encodeBool(bool value)
 {
-    m_encoder->encode(value);
+    *m_encoder << value;
 }
 
 void EncoderAdapter::encodeUInt16(uint16_t value)
 {
-    m_encoder->encode(value);
+    *m_encoder << value;
 }
 
 void EncoderAdapter::encodeUInt32(uint32_t value)
 {
-    m_encoder->encode(value);
+    *m_encoder << value;
 }
 
 void EncoderAdapter::encodeUInt64(uint64_t value)
 {
-    m_encoder->encode(value);
+    *m_encoder << value;
 }
 
 void EncoderAdapter::encodeInt32(int32_t value)
 {
-    m_encoder->encode(value);
+    *m_encoder << value;
 }
 
 void EncoderAdapter::encodeInt64(int64_t value)
 {
-    m_encoder->encode(value);
+    *m_encoder << value;
 }
 
 void EncoderAdapter::encodeFloat(float value)
 {
-    m_encoder->encode(value);
+    *m_encoder << value;
 }
 
 void EncoderAdapter::encodeDouble(double value)
 {
-    m_encoder->encode(value);
+    *m_encoder << value;
 }
 
 void EncoderAdapter::encodeString(const String& value)
@@ -100,15 +100,15 @@ void EncoderAdapter::encodeString(const String& value)
 
     // Special case the null string.
     if (value.isNull()) {
-        m_encoder->encode(std::numeric_limits<uint32_t>::max());
+        *m_encoder << std::numeric_limits<uint32_t>::max();
         return;
     }
 
     uint32_t length = value.length();
-    m_encoder->encode(length);
+    *m_encoder << length;
 
     uint64_t lengthInBytes = length * sizeof(UChar);
-    m_encoder->encode(lengthInBytes);
+    *m_encoder << lengthInBytes;
     m_encoder->encodeFixedLengthData(reinterpret_cast<const uint8_t*>(value.characters()), length * sizeof(UChar), __alignof(UChar)); 
 }