<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204678] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204678">204678</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2016-08-20 02:38:41 -0700 (Sat, 20 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Unreviewed GTK build fix since <a href="http://trac.webkit.org/projects/webkit/changeset/204665">r204665</a> and 204668
https://bugs.webkit.org/show_bug.cgi?id=161020
* CMakeLists.txt:
* Platform/IPC/MessageRecorder.cpp:
(IPC::MessageRecorder::recordOutgoingMessage):
* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::processMessage):
(IPC::Connection::sendOutgoingMessage):
* Platform/unix/SharedMemoryUnix.cpp:
(WebKit::SharedMemory::Handle::encode):
(WebKit::SharedMemory::Handle::decode):
* PlatformGTK.cmake:
* Scripts/webkit/LegacyMessageReceiver-expected.cpp:
(Messages::WebPage::GetPluginProcessConnection::DelayedReply::DelayedReply):
(Messages::WebPage::TestMultipleAttributes::DelayedReply::DelayedReply):
(WebKit::WebPage::didReceiveWebPageMessage):
(WebKit::WebPage::didReceiveSyncWebPageMessage):
* Scripts/webkit/LegacyMessages-expected.h:
* Scripts/webkit/MessageReceiver-expected.cpp:
(Messages::WebPage::GetPluginProcessConnection::DelayedReply::DelayedReply):
(Messages::WebPage::TestMultipleAttributes::DelayedReply::DelayedReply):
(WebKit::WebPage::didReceiveMessage):
(WebKit::WebPage::didReceiveSyncMessage):
* Scripts/webkit/Messages-expected.h:
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(IPC::ArgumentCoder<WebCore::FilterOperations>::encode):
(IPC::ArgumentCoder<WebCore::FilterOperations>::decode):
(IPC::ArgumentCoder<TransformOperations>::encode):
(IPC::ArgumentCoder<TransformOperations>::decode):
(IPC::encodeTimingFunction):
(IPC::decodeTimingFunction):
(IPC::ArgumentCoder<TextureMapperAnimation>::encode):
(IPC::ArgumentCoder<TextureMapperAnimation>::decode):
(IPC::ArgumentCoder<TextureMapperAnimations>::encode):
(IPC::ArgumentCoder<TextureMapperAnimations>::decode):
(IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode):
(IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode):
(IPC::ArgumentCoder<SurfaceUpdateInfo>::encode):
(IPC::ArgumentCoder<SurfaceUpdateInfo>::decode):
(IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::encode):
(IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::decode):
(IPC::ArgumentCoder<TileUpdateInfo>::encode):
(IPC::ArgumentCoder<TileUpdateInfo>::decode):
(IPC::ArgumentCoder<TileCreationInfo>::encode):
(IPC::ArgumentCoder<TileCreationInfo>::decode):
(IPC::encodeCoordinatedSurface):
(IPC::decodeCoordinatedSurface):
(IPC::ArgumentCoder<CoordinatedGraphicsState>::encode):
(IPC::ArgumentCoder<CoordinatedGraphicsState>::decode):
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
* Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp:
(WebKit::WebCoordinatedSurface::Handle::encode):
(WebKit::WebCoordinatedSurface::Handle::decode):
* Shared/CoordinatedGraphics/WebCoordinatedSurface.h:
* Shared/WebBatteryStatus.cpp:
(WebKit::WebBatteryStatus::Data::encode):
(WebKit::WebBatteryStatus::Data::decode):
* Shared/WebBatteryStatus.h:
* Shared/gtk/ArgumentCodersGtk.cpp:
(IPC::encodeImage):
(IPC::decodeImage):
(IPC::encodeDataObject):
(IPC::decodeDataObject):
(IPC::ArgumentCoder<DragData>::encode):
(IPC::ArgumentCoder<DragData>::decode):
(IPC::encodeGKeyFile):
(IPC::decodeGKeyFile):
(IPC::encode):
(IPC::decode):
* Shared/gtk/ArgumentCodersGtk.h:
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
(IPC::ArgumentCoder<CertificateInfo>::encode):
(IPC::ArgumentCoder<CertificateInfo>::decode):
(IPC::ArgumentCoder<ResourceError>::encodePlatformData):
(IPC::ArgumentCoder<ResourceError>::decodePlatformData):
(IPC::ArgumentCoder<ProtectionSpace>::encodePlatformData):
(IPC::ArgumentCoder<ProtectionSpace>::decodePlatformData):
(IPC::ArgumentCoder<Credential>::encodePlatformData):
(IPC::ArgumentCoder<Credential>::decodePlatformData):
* UIProcess/LegacySessionStateCodingNone.cpp:
(WebKit::encodeLegacySessionState):
(WebKit::decodeLegacySessionState):
* UIProcess/WebBatteryManagerProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageRecordercpp">trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp">trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformunixSharedMemoryUnixcpp">trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2ScriptswebkitLegacyMessageReceiverexpectedcpp">trunk/Source/WebKit2/Scripts/webkit/LegacyMessageReceiver-expected.cpp</a></li>
<li><a href="#trunkSourceWebKit2ScriptswebkitLegacyMessagesexpectedh">trunk/Source/WebKit2/Scripts/webkit/LegacyMessages-expected.h</a></li>
<li><a href="#trunkSourceWebKit2ScriptswebkitMessageReceiverexpectedcpp">trunk/Source/WebKit2/Scripts/webkit/MessageReceiver-expected.cpp</a></li>
<li><a href="#trunkSourceWebKit2ScriptswebkitMessagesexpectedh">trunk/Source/WebKit2/Scripts/webkit/Messages-expected.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCodersh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfacecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfaceh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBatteryStatuscpp">trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBatteryStatush">trunk/Source/WebKit2/Shared/WebBatteryStatus.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp">trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkArgumentCodersGtkh">trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h</a></li>
<li><a href="#trunkSourceWebKit2SharedsoupWebCoreArgumentCodersSoupcpp">trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLegacySessionStateCodingNonecpp">trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBatteryManagerProxyh">trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -220,8 +220,8 @@
</span><span class="cx"> Platform/IPC/Attachment.cpp
</span><span class="cx"> Platform/IPC/Connection.cpp
</span><span class="cx"> Platform/IPC/DataReference.cpp
</span><ins>+ Platform/IPC/Decoder.cpp
</ins><span class="cx"> Platform/IPC/Encoder.cpp
</span><del>- Platform/IPC/Decoder.cpp
</del><span class="cx"> Platform/IPC/MessageReceiverMap.cpp
</span><span class="cx"> Platform/IPC/MessageSender.cpp
</span><span class="cx"> Platform/IPC/StringReference.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -1,3 +1,92 @@
</span><ins>+2016-08-20 Javier Fernandez <jfernandez@igalia.com>
+
+ [GTK] Unreviewed GTK build fix since r204665 and 204668
+ https://bugs.webkit.org/show_bug.cgi?id=161020
+
+ * CMakeLists.txt:
+ * Platform/IPC/MessageRecorder.cpp:
+ (IPC::MessageRecorder::recordOutgoingMessage):
+ * Platform/IPC/unix/ConnectionUnix.cpp:
+ (IPC::Connection::processMessage):
+ (IPC::Connection::sendOutgoingMessage):
+ * Platform/unix/SharedMemoryUnix.cpp:
+ (WebKit::SharedMemory::Handle::encode):
+ (WebKit::SharedMemory::Handle::decode):
+ * PlatformGTK.cmake:
+ * Scripts/webkit/LegacyMessageReceiver-expected.cpp:
+ (Messages::WebPage::GetPluginProcessConnection::DelayedReply::DelayedReply):
+ (Messages::WebPage::TestMultipleAttributes::DelayedReply::DelayedReply):
+ (WebKit::WebPage::didReceiveWebPageMessage):
+ (WebKit::WebPage::didReceiveSyncWebPageMessage):
+ * Scripts/webkit/LegacyMessages-expected.h:
+ * Scripts/webkit/MessageReceiver-expected.cpp:
+ (Messages::WebPage::GetPluginProcessConnection::DelayedReply::DelayedReply):
+ (Messages::WebPage::TestMultipleAttributes::DelayedReply::DelayedReply):
+ (WebKit::WebPage::didReceiveMessage):
+ (WebKit::WebPage::didReceiveSyncMessage):
+ * Scripts/webkit/Messages-expected.h:
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (IPC::ArgumentCoder<WebCore::FilterOperations>::encode):
+ (IPC::ArgumentCoder<WebCore::FilterOperations>::decode):
+ (IPC::ArgumentCoder<TransformOperations>::encode):
+ (IPC::ArgumentCoder<TransformOperations>::decode):
+ (IPC::encodeTimingFunction):
+ (IPC::decodeTimingFunction):
+ (IPC::ArgumentCoder<TextureMapperAnimation>::encode):
+ (IPC::ArgumentCoder<TextureMapperAnimation>::decode):
+ (IPC::ArgumentCoder<TextureMapperAnimations>::encode):
+ (IPC::ArgumentCoder<TextureMapperAnimations>::decode):
+ (IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode):
+ (IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode):
+ (IPC::ArgumentCoder<SurfaceUpdateInfo>::encode):
+ (IPC::ArgumentCoder<SurfaceUpdateInfo>::decode):
+ (IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::encode):
+ (IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::decode):
+ (IPC::ArgumentCoder<TileUpdateInfo>::encode):
+ (IPC::ArgumentCoder<TileUpdateInfo>::decode):
+ (IPC::ArgumentCoder<TileCreationInfo>::encode):
+ (IPC::ArgumentCoder<TileCreationInfo>::decode):
+ (IPC::encodeCoordinatedSurface):
+ (IPC::decodeCoordinatedSurface):
+ (IPC::ArgumentCoder<CoordinatedGraphicsState>::encode):
+ (IPC::ArgumentCoder<CoordinatedGraphicsState>::decode):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
+ * Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp:
+ (WebKit::WebCoordinatedSurface::Handle::encode):
+ (WebKit::WebCoordinatedSurface::Handle::decode):
+ * Shared/CoordinatedGraphics/WebCoordinatedSurface.h:
+ * Shared/WebBatteryStatus.cpp:
+ (WebKit::WebBatteryStatus::Data::encode):
+ (WebKit::WebBatteryStatus::Data::decode):
+ * Shared/WebBatteryStatus.h:
+ * Shared/gtk/ArgumentCodersGtk.cpp:
+ (IPC::encodeImage):
+ (IPC::decodeImage):
+ (IPC::encodeDataObject):
+ (IPC::decodeDataObject):
+ (IPC::ArgumentCoder<DragData>::encode):
+ (IPC::ArgumentCoder<DragData>::decode):
+ (IPC::encodeGKeyFile):
+ (IPC::decodeGKeyFile):
+ (IPC::encode):
+ (IPC::decode):
+ * Shared/gtk/ArgumentCodersGtk.h:
+ * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
+ (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
+ (IPC::ArgumentCoder<CertificateInfo>::encode):
+ (IPC::ArgumentCoder<CertificateInfo>::decode):
+ (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
+ (IPC::ArgumentCoder<ResourceError>::decodePlatformData):
+ (IPC::ArgumentCoder<ProtectionSpace>::encodePlatformData):
+ (IPC::ArgumentCoder<ProtectionSpace>::decodePlatformData):
+ (IPC::ArgumentCoder<Credential>::encodePlatformData):
+ (IPC::ArgumentCoder<Credential>::decodePlatformData):
+ * UIProcess/LegacySessionStateCodingNone.cpp:
+ (WebKit::encodeLegacySessionState):
+ (WebKit::decodeLegacySessionState):
+ * UIProcess/WebBatteryManagerProxy.h:
+
</ins><span class="cx"> 2016-08-20 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, build fix attempt after r204665 and r204668.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageRecordercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #if HAVE(DTRACE)
</span><span class="cx">
</span><span class="cx"> #include "Connection.h"
</span><del>-#include "MessageDecoder.h"
-#include "MessageEncoder.h"
</del><ins>+#include "Decoder.h"
+#include "Encoder.h"
</ins><span class="cx"> #include "MessageRecorderProbes.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> return WEBKITMESSAGERECORDER_MESSAGE_RECEIVED_ENABLED() || WEBKITMESSAGERECORDER_MESSAGE_SENT_ENABLED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<MessageRecorder::MessageProcessingToken> MessageRecorder::recordOutgoingMessage(Connection& connection, MessageEncoder& encoder)
</del><ins>+std::unique_ptr<MessageRecorder::MessageProcessingToken> MessageRecorder::recordOutgoingMessage(Connection& connection, Encoder& encoder)
</ins><span class="cx"> {
</span><span class="cx"> if (!isEnabled() || !connection.isValid())
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> if (messageInfo.isMessageBodyIsOutOfLine())
</span><span class="cx"> messageBody = reinterpret_cast<uint8_t*>(oolMessageBody->data());
</span><span class="cx">
</span><del>- auto decoder = std::make_unique<MessageDecoder>(DataReference(messageBody, messageInfo.bodySize()), WTFMove(attachments));
</del><ins>+ auto decoder = std::make_unique<Decoder>(DataReference(messageBody, messageInfo.bodySize()), WTFMove(attachments));
</ins><span class="cx">
</span><span class="cx"> processIncomingMessage(WTFMove(decoder));
</span><span class="cx">
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> return m_isConnected;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Connection::sendOutgoingMessage(std::unique_ptr<MessageEncoder> encoder)
</del><ins>+bool Connection::sendOutgoingMessage(std::unique_ptr<Encoder> encoder)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(sizeof(MessageInfo) + attachmentMaxAmount * sizeof(size_t) <= messageMaxSize, AttachmentsFitToMessageInline);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformunixSharedMemoryUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #if USE(UNIX_DOMAIN_SOCKETS)
</span><span class="cx"> #include "SharedMemory.h"
</span><span class="cx">
</span><del>-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
</del><ins>+#include "Decoder.h"
+#include "Encoder.h"
</ins><span class="cx"> #include <errno.h>
</span><span class="cx"> #include <fcntl.h>
</span><span class="cx"> #include <stdlib.h>
</span><span class="lines">@@ -64,12 +64,12 @@
</span><span class="cx"> return m_attachment.fileDescriptor() == -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SharedMemory::Handle::encode(IPC::ArgumentEncoder& encoder) const
</del><ins>+void SharedMemory::Handle::encode(IPC::Encoder& encoder) const
</ins><span class="cx"> {
</span><span class="cx"> encoder << releaseAttachment();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SharedMemory::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
</del><ins>+bool SharedMemory::Handle::decode(IPC::Decoder& decoder, Handle& handle)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(handle, handle.isNull());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ScriptswebkitLegacyMessageReceiverexpectedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/LegacyMessageReceiver-expected.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/LegacyMessageReceiver-expected.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Scripts/webkit/LegacyMessageReceiver-expected.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include "MachPort.h"
</span><span class="cx"> #endif
</span><del>-#include "MessageDecoder.h"
</del><ins>+#include "Decoder.h"
</ins><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION)) || (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebPage {
</span><span class="cx">
</span><del>-GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
</del><ins>+GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)
</ins><span class="cx"> : m_connection(connection)
</span><span class="cx"> , m_encoder(WTFMove(encoder))
</span><span class="cx"> {
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return _result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
</del><ins>+TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)
</ins><span class="cx"> : m_connection(connection)
</span><span class="cx"> , m_encoder(WTFMove(encoder))
</span><span class="cx"> {
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void WebPage::didReceiveWebPageMessage(IPC::Connection*, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::didReceiveWebPageMessage(IPC::Connection*, IPC::Decoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> if (decoder.messageName() == Messages::WebPage::LoadURL::name()) {
</span><span class="cx"> IPC::handleMessage<Messages::WebPage::LoadURL>(decoder, this, &WebPage::loadURL);
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::didReceiveSyncWebPageMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
</del><ins>+void WebPage::didReceiveSyncWebPageMessage(IPC::Connection* connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
</ins><span class="cx"> {
</span><span class="cx"> if (decoder.messageName() == Messages::WebPage::CreatePlugin::name()) {
</span><span class="cx"> IPC::handleMessage<Messages::WebPage::CreatePlugin>(decoder, *replyEncoder, this, &WebPage::createPlugin);
</span></span></pre></div>
<a id="trunkSourceWebKit2ScriptswebkitLegacyMessagesexpectedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/LegacyMessages-expected.h (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/LegacyMessages-expected.h 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Scripts/webkit/LegacyMessages-expected.h 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "Connection.h"
</span><del>-#include "MessageEncoder.h"
</del><ins>+#include "Encoder.h"
</ins><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "StringReference.h"
</span><span class="cx"> #include <WebCore/GraphicsLayer.h>
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> static const bool isSync = true;
</span><span class="cx">
</span><span class="cx"> struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
</span><del>- DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
</del><ins>+ DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);
</ins><span class="cx"> ~DelayedReply();
</span><span class="cx">
</span><span class="cx"> bool send(const IPC::Connection::Handle& connectionHandle);
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><del>- std::unique_ptr<IPC::MessageEncoder> m_encoder;
</del><ins>+ std::unique_ptr<IPC::Encoder> m_encoder;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef IPC::Arguments<IPC::Connection::Handle&> Reply;
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> static const bool isSync = true;
</span><span class="cx">
</span><span class="cx"> struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
</span><del>- DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
</del><ins>+ DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);
</ins><span class="cx"> ~DelayedReply();
</span><span class="cx">
</span><span class="cx"> bool send();
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><del>- std::unique_ptr<IPC::MessageEncoder> m_encoder;
</del><ins>+ std::unique_ptr<IPC::Encoder> m_encoder;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef IPC::Arguments<> Reply;
</span></span></pre></div>
<a id="trunkSourceWebKit2ScriptswebkitMessageReceiverexpectedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/MessageReceiver-expected.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/MessageReceiver-expected.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Scripts/webkit/MessageReceiver-expected.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include "MachPort.h"
</span><span class="cx"> #endif
</span><del>-#include "MessageDecoder.h"
</del><ins>+#include "Decoder.h"
</ins><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #if (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION && SOME_OTHER_MESSAGE_CONDITION)) || (ENABLE(TOUCH_EVENTS) && (NESTED_MESSAGE_CONDITION || SOME_OTHER_MESSAGE_CONDITION))
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebPage {
</span><span class="cx">
</span><del>-GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
</del><ins>+GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)
</ins><span class="cx"> : m_connection(connection)
</span><span class="cx"> , m_encoder(WTFMove(encoder))
</span><span class="cx"> {
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return _result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
</del><ins>+TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)
</ins><span class="cx"> : m_connection(connection)
</span><span class="cx"> , m_encoder(WTFMove(encoder))
</span><span class="cx"> {
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void WebPage::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::didReceiveMessage(IPC::Connection* connection, IPC::Decoder& decoder)
</ins><span class="cx"> {
</span><span class="cx"> if (decoder.messageName() == Messages::WebPage::LoadURL::name()) {
</span><span class="cx"> IPC::handleMessage<Messages::WebPage::LoadURL>(decoder, this, &WebPage::loadURL);
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
</del><ins>+void WebPage::didReceiveSyncMessage(IPC::Connection* connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
</ins><span class="cx"> {
</span><span class="cx"> if (decoder.messageName() == Messages::WebPage::CreatePlugin::name()) {
</span><span class="cx"> IPC::handleMessage<Messages::WebPage::CreatePlugin>(decoder, *replyEncoder, this, &WebPage::createPlugin);
</span></span></pre></div>
<a id="trunkSourceWebKit2ScriptswebkitMessagesexpectedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/Messages-expected.h (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/Messages-expected.h 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Scripts/webkit/Messages-expected.h 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "Connection.h"
</span><del>-#include "MessageEncoder.h"
</del><ins>+#include "Encoder.h"
</ins><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "StringReference.h"
</span><span class="cx"> #include <WebCore/GraphicsLayer.h>
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> static const bool isSync = true;
</span><span class="cx">
</span><span class="cx"> struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
</span><del>- DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
</del><ins>+ DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);
</ins><span class="cx"> ~DelayedReply();
</span><span class="cx">
</span><span class="cx"> bool send(const IPC::Connection::Handle& connectionHandle);
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><del>- std::unique_ptr<IPC::MessageEncoder> m_encoder;
</del><ins>+ std::unique_ptr<IPC::Encoder> m_encoder;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef IPC::Arguments<IPC::Connection::Handle&> Reply;
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> static const bool isSync = true;
</span><span class="cx">
</span><span class="cx"> struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
</span><del>- DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
</del><ins>+ DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);
</ins><span class="cx"> ~DelayedReply();
</span><span class="cx">
</span><span class="cx"> bool send();
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><del>- std::unique_ptr<IPC::MessageEncoder> m_encoder;
</del><ins>+ std::unique_ptr<IPC::Encoder> m_encoder;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef IPC::Arguments<> Reply;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-void ArgumentCoder<WebCore::FilterOperations>::encode(ArgumentEncoder& encoder, const WebCore::FilterOperations& filters)
</del><ins>+void ArgumentCoder<WebCore::FilterOperations>::encode(Encoder& encoder, const WebCore::FilterOperations& filters)
</ins><span class="cx"> {
</span><span class="cx"> encoder << static_cast<uint32_t>(filters.size());
</span><span class="cx"> for (size_t i = 0; i < filters.size(); ++i) {
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<WebCore::FilterOperations>::decode(ArgumentDecoder& decoder, WebCore::FilterOperations& filters)
</del><ins>+bool ArgumentCoder<WebCore::FilterOperations>::decode(Decoder& decoder, WebCore::FilterOperations& filters)
</ins><span class="cx"> {
</span><span class="cx"> uint32_t size;
</span><span class="cx"> if (!decoder.decode(size))
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<TransformOperations>::encode(ArgumentEncoder& encoder, const TransformOperations& transformOperations)
</del><ins>+void ArgumentCoder<TransformOperations>::encode(Encoder& encoder, const TransformOperations& transformOperations)
</ins><span class="cx"> {
</span><span class="cx"> encoder << static_cast<uint32_t>(transformOperations.size());
</span><span class="cx"> for (const auto& operation : transformOperations.operations()) {
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<TransformOperations>::decode(ArgumentDecoder& decoder, TransformOperations& transformOperations)
</del><ins>+bool ArgumentCoder<TransformOperations>::decode(Decoder& decoder, TransformOperations& transformOperations)
</ins><span class="cx"> {
</span><span class="cx"> uint32_t operationsSize;
</span><span class="cx"> if (!decoder.decode(operationsSize))
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void encodeTimingFunction(ArgumentEncoder& encoder, const TimingFunction* timingFunction)
</del><ins>+static void encodeTimingFunction(Encoder& encoder, const TimingFunction* timingFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!timingFunction) {
</span><span class="cx"> encoder.encodeEnum(TimingFunction::TimingFunctionType(-1));
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool decodeTimingFunction(ArgumentDecoder& decoder, RefPtr<TimingFunction>& timingFunction)
</del><ins>+bool decodeTimingFunction(Decoder& decoder, RefPtr<TimingFunction>& timingFunction)
</ins><span class="cx"> {
</span><span class="cx"> TimingFunction::TimingFunctionType type;
</span><span class="cx"> if (!decoder.decodeEnum(type))
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<TextureMapperAnimation>::encode(ArgumentEncoder& encoder, const TextureMapperAnimation& animation)
</del><ins>+void ArgumentCoder<TextureMapperAnimation>::encode(Encoder& encoder, const TextureMapperAnimation& animation)
</ins><span class="cx"> {
</span><span class="cx"> encoder << animation.name();
</span><span class="cx"> encoder << animation.boxSize();
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<TextureMapperAnimation>::decode(ArgumentDecoder& decoder, TextureMapperAnimation& animation)
</del><ins>+bool ArgumentCoder<TextureMapperAnimation>::decode(Decoder& decoder, TextureMapperAnimation& animation)
</ins><span class="cx"> {
</span><span class="cx"> String name;
</span><span class="cx"> FloatSize boxSize;
</span><span class="lines">@@ -575,18 +575,18 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<TextureMapperAnimations>::encode(ArgumentEncoder& encoder, const TextureMapperAnimations& animations)
</del><ins>+void ArgumentCoder<TextureMapperAnimations>::encode(Encoder& encoder, const TextureMapperAnimations& animations)
</ins><span class="cx"> {
</span><span class="cx"> encoder << animations.animations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<TextureMapperAnimations>::decode(ArgumentDecoder& decoder, TextureMapperAnimations& animations)
</del><ins>+bool ArgumentCoder<TextureMapperAnimations>::decode(Decoder& decoder, TextureMapperAnimations& animations)
</ins><span class="cx"> {
</span><span class="cx"> return decoder.decode(animations.animations());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><del>-void ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode(ArgumentEncoder& encoder, const WebCore::GraphicsSurfaceToken& token)
</del><ins>+void ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode(Encoder& encoder, const WebCore::GraphicsSurfaceToken& token)
</ins><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> encoder << Attachment(token.frontBufferHandle, MACH_MSG_TYPE_MOVE_SEND);
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(ArgumentDecoder& decoder, WebCore::GraphicsSurfaceToken& token)
</del><ins>+bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(Decoder& decoder, WebCore::GraphicsSurfaceToken& token)
</ins><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> Attachment frontAttachment, backAttachment;
</span><span class="lines">@@ -614,17 +614,17 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void ArgumentCoder<SurfaceUpdateInfo>::encode(ArgumentEncoder& encoder, const SurfaceUpdateInfo& surfaceUpdateInfo)
</del><ins>+void ArgumentCoder<SurfaceUpdateInfo>::encode(Encoder& encoder, const SurfaceUpdateInfo& surfaceUpdateInfo)
</ins><span class="cx"> {
</span><span class="cx"> SimpleArgumentCoder<SurfaceUpdateInfo>::encode(encoder, surfaceUpdateInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<SurfaceUpdateInfo>::decode(ArgumentDecoder& decoder, SurfaceUpdateInfo& surfaceUpdateInfo)
</del><ins>+bool ArgumentCoder<SurfaceUpdateInfo>::decode(Decoder& decoder, SurfaceUpdateInfo& surfaceUpdateInfo)
</ins><span class="cx"> {
</span><span class="cx"> return SimpleArgumentCoder<SurfaceUpdateInfo>::decode(decoder, surfaceUpdateInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<CoordinatedGraphicsLayerState>::encode(ArgumentEncoder& encoder, const CoordinatedGraphicsLayerState& state)
</del><ins>+void ArgumentCoder<CoordinatedGraphicsLayerState>::encode(Encoder& encoder, const CoordinatedGraphicsLayerState& state)
</ins><span class="cx"> {
</span><span class="cx"> encoder << state.changeMask;
</span><span class="cx">
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx"> encoder << state.committedScrollOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<CoordinatedGraphicsLayerState>::decode(ArgumentDecoder& decoder, CoordinatedGraphicsLayerState& state)
</del><ins>+bool ArgumentCoder<CoordinatedGraphicsLayerState>::decode(Decoder& decoder, CoordinatedGraphicsLayerState& state)
</ins><span class="cx"> {
</span><span class="cx"> if (!decoder.decode(state.changeMask))
</span><span class="cx"> return false;
</span><span class="lines">@@ -802,27 +802,27 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<TileUpdateInfo>::encode(ArgumentEncoder& encoder, const TileUpdateInfo& updateInfo)
</del><ins>+void ArgumentCoder<TileUpdateInfo>::encode(Encoder& encoder, const TileUpdateInfo& updateInfo)
</ins><span class="cx"> {
</span><span class="cx"> SimpleArgumentCoder<TileUpdateInfo>::encode(encoder, updateInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<TileUpdateInfo>::decode(ArgumentDecoder& decoder, TileUpdateInfo& updateInfo)
</del><ins>+bool ArgumentCoder<TileUpdateInfo>::decode(Decoder& decoder, TileUpdateInfo& updateInfo)
</ins><span class="cx"> {
</span><span class="cx"> return SimpleArgumentCoder<TileUpdateInfo>::decode(decoder, updateInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<TileCreationInfo>::encode(ArgumentEncoder& encoder, const TileCreationInfo& updateInfo)
</del><ins>+void ArgumentCoder<TileCreationInfo>::encode(Encoder& encoder, const TileCreationInfo& updateInfo)
</ins><span class="cx"> {
</span><span class="cx"> SimpleArgumentCoder<TileCreationInfo>::encode(encoder, updateInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<TileCreationInfo>::decode(ArgumentDecoder& decoder, TileCreationInfo& updateInfo)
</del><ins>+bool ArgumentCoder<TileCreationInfo>::decode(Decoder& decoder, TileCreationInfo& updateInfo)
</ins><span class="cx"> {
</span><span class="cx"> return SimpleArgumentCoder<TileCreationInfo>::decode(decoder, updateInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void encodeCoordinatedSurface(ArgumentEncoder& encoder, const RefPtr<CoordinatedSurface>& surface)
</del><ins>+static void encodeCoordinatedSurface(Encoder& encoder, const RefPtr<CoordinatedSurface>& surface)
</ins><span class="cx"> {
</span><span class="cx"> bool isValidSurface = false;
</span><span class="cx"> if (!surface) {
</span><span class="lines">@@ -841,7 +841,7 @@
</span><span class="cx"> encoder << handle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeCoordinatedSurface(ArgumentDecoder& decoder, RefPtr<CoordinatedSurface>& surface)
</del><ins>+static bool decodeCoordinatedSurface(Decoder& decoder, RefPtr<CoordinatedSurface>& surface)
</ins><span class="cx"> {
</span><span class="cx"> bool isValidSurface;
</span><span class="cx"> if (!decoder.decode(isValidSurface))
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<CoordinatedGraphicsState>::encode(ArgumentEncoder& encoder, const CoordinatedGraphicsState& state)
</del><ins>+void ArgumentCoder<CoordinatedGraphicsState>::encode(Encoder& encoder, const CoordinatedGraphicsState& state)
</ins><span class="cx"> {
</span><span class="cx"> encoder << state.rootCompositingLayer;
</span><span class="cx"> encoder << state.scrollPosition;
</span><span class="lines">@@ -889,7 +889,7 @@
</span><span class="cx"> encoder << state.updateAtlasesToRemove;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<CoordinatedGraphicsState>::decode(ArgumentDecoder& decoder, CoordinatedGraphicsState& state)
</del><ins>+bool ArgumentCoder<CoordinatedGraphicsState>::decode(Decoder& decoder, CoordinatedGraphicsState& state)
</ins><span class="cx"> {
</span><span class="cx"> if (!decoder.decode(state.rootCompositingLayer))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -54,55 +54,55 @@
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::FilterOperations> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::FilterOperations&);
- static bool decode(ArgumentDecoder&, WebCore::FilterOperations&);
</del><ins>+ static void encode(Encoder&, const WebCore::FilterOperations&);
+ static bool decode(Decoder&, WebCore::FilterOperations&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::TransformOperations> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::TransformOperations&);
- static bool decode(ArgumentDecoder&, WebCore::TransformOperations&);
</del><ins>+ static void encode(Encoder&, const WebCore::TransformOperations&);
+ static bool decode(Decoder&, WebCore::TransformOperations&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::TextureMapperAnimations> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::TextureMapperAnimations&);
- static bool decode(ArgumentDecoder&, WebCore::TextureMapperAnimations&);
</del><ins>+ static void encode(Encoder&, const WebCore::TextureMapperAnimations&);
+ static bool decode(Decoder&, WebCore::TextureMapperAnimations&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::TextureMapperAnimation> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::TextureMapperAnimation&);
- static bool decode(ArgumentDecoder&, WebCore::TextureMapperAnimation&);
</del><ins>+ static void encode(Encoder&, const WebCore::TextureMapperAnimation&);
+ static bool decode(Decoder&, WebCore::TextureMapperAnimation&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::GraphicsSurfaceToken> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::GraphicsSurfaceToken&);
- static bool decode(ArgumentDecoder&, WebCore::GraphicsSurfaceToken&);
</del><ins>+ static void encode(Encoder&, const WebCore::GraphicsSurfaceToken&);
+ static bool decode(Decoder&, WebCore::GraphicsSurfaceToken&);
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::SurfaceUpdateInfo> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::SurfaceUpdateInfo&);
- static bool decode(ArgumentDecoder&, WebCore::SurfaceUpdateInfo&);
</del><ins>+ static void encode(Encoder&, const WebCore::SurfaceUpdateInfo&);
+ static bool decode(Decoder&, WebCore::SurfaceUpdateInfo&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::CoordinatedGraphicsLayerState> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::CoordinatedGraphicsLayerState&);
- static bool decode(ArgumentDecoder&, WebCore::CoordinatedGraphicsLayerState&);
</del><ins>+ static void encode(Encoder&, const WebCore::CoordinatedGraphicsLayerState&);
+ static bool decode(Decoder&, WebCore::CoordinatedGraphicsLayerState&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::TileUpdateInfo> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::TileUpdateInfo&);
- static bool decode(ArgumentDecoder&, WebCore::TileUpdateInfo&);
</del><ins>+ static void encode(Encoder&, const WebCore::TileUpdateInfo&);
+ static bool decode(Decoder&, WebCore::TileUpdateInfo&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::TileCreationInfo> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::TileCreationInfo&);
- static bool decode(ArgumentDecoder&, WebCore::TileCreationInfo&);
</del><ins>+ static void encode(Encoder&, const WebCore::TileCreationInfo&);
+ static bool decode(Decoder&, WebCore::TileCreationInfo&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::CoordinatedGraphicsState> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::CoordinatedGraphicsState&);
- static bool decode(ArgumentDecoder&, WebCore::CoordinatedGraphicsState&);
</del><ins>+ static void encode(Encoder&, const WebCore::CoordinatedGraphicsState&);
+ static bool decode(Decoder&, WebCore::CoordinatedGraphicsState&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoordinatedSurface::Handle::encode(IPC::ArgumentEncoder& encoder) const
</del><ins>+void WebCoordinatedSurface::Handle::encode(IPC::Encoder& encoder) const
</ins><span class="cx"> {
</span><span class="cx"> encoder << m_size << m_flags;
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> encoder << m_bitmapHandle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebCoordinatedSurface::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
</del><ins>+bool WebCoordinatedSurface::Handle::decode(IPC::Decoder& decoder, Handle& handle)
</ins><span class="cx"> {
</span><span class="cx"> if (!decoder.decode(handle.m_size))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> public:
</span><span class="cx"> Handle();
</span><span class="cx">
</span><del>- void encode(IPC::ArgumentEncoder&) const;
- static bool decode(IPC::ArgumentDecoder&, Handle&);
</del><ins>+ void encode(IPC::Encoder&) const;
+ static bool decode(IPC::Decoder&, Handle&);
</ins><span class="cx">
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> WebCore::GraphicsSurfaceToken graphicsSurfaceToken() const { return m_graphicsSurfaceToken; }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBatteryStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebBatteryStatus::Data::encode(IPC::ArgumentEncoder& encoder) const
</del><ins>+void WebBatteryStatus::Data::encode(IPC::Encoder& encoder) const
</ins><span class="cx"> {
</span><span class="cx"> encoder << isCharging;
</span><span class="cx"> encoder << chargingTime;
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> encoder << level;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebBatteryStatus::Data::decode(IPC::ArgumentDecoder& decoder, Data& result)
</del><ins>+bool WebBatteryStatus::Data::decode(IPC::Decoder& decoder, Data& result)
</ins><span class="cx"> {
</span><span class="cx"> if (!decoder.decode(result.isCharging))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBatteryStatush"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBatteryStatus.h (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBatteryStatus.h 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/WebBatteryStatus.h 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
</del><ins>+#include "Decoder.h"
+#include "Encoder.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> class WebBatteryStatus : public API::ObjectImpl<API::Object::Type::BatteryStatus> {
</span><span class="cx"> public:
</span><span class="cx"> struct Data {
</span><del>- void encode(IPC::ArgumentEncoder&) const;
- static bool decode(IPC::ArgumentDecoder&, Data&);
</del><ins>+ void encode(IPC::Encoder&) const;
+ static bool decode(IPC::Decoder&, Data&);
</ins><span class="cx">
</span><span class="cx"> bool isCharging;
</span><span class="cx"> double chargingTime;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-static void encodeImage(ArgumentEncoder& encoder, const GdkPixbuf* pixbuf)
</del><ins>+static void encodeImage(Encoder& encoder, const GdkPixbuf* pixbuf)
</ins><span class="cx"> {
</span><span class="cx"> IntSize imageSize(gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(imageSize, ShareableBitmap::SupportsAlpha);
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> encoder << handle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeImage(ArgumentDecoder& decoder, GRefPtr<GdkPixbuf>& pixbuf)
</del><ins>+static bool decodeImage(Decoder& decoder, GRefPtr<GdkPixbuf>& pixbuf)
</ins><span class="cx"> {
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (!decoder.decode(handle))
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void encodeDataObject(ArgumentEncoder& encoder, const DataObjectGtk* dataObject)
</del><ins>+static void encodeDataObject(Encoder& encoder, const DataObjectGtk* dataObject)
</ins><span class="cx"> {
</span><span class="cx"> bool hasText = dataObject->hasText();
</span><span class="cx"> encoder << hasText;
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> encoder << dataObject->unknownTypes();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeDataObject(ArgumentDecoder& decoder, RefPtr<DataObjectGtk>& dataObject)
</del><ins>+static bool decodeDataObject(Decoder& decoder, RefPtr<DataObjectGtk>& dataObject)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<DataObjectGtk> data = DataObjectGtk::create();
</span><span class="cx">
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-void ArgumentCoder<DragData>::encode(ArgumentEncoder& encoder, const DragData& dragData)
</del><ins>+void ArgumentCoder<DragData>::encode(Encoder& encoder, const DragData& dragData)
</ins><span class="cx"> {
</span><span class="cx"> encoder << dragData.clientPosition();
</span><span class="cx"> encoder << dragData.globalPosition();
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> encodeDataObject(encoder, platformData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<DragData>::decode(ArgumentDecoder& decoder, DragData& dragData)
</del><ins>+bool ArgumentCoder<DragData>::decode(Decoder& decoder, DragData& dragData)
</ins><span class="cx"> {
</span><span class="cx"> IntPoint clientPosition;
</span><span class="cx"> if (!decoder.decode(clientPosition))
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><del>-static void encodeGKeyFile(ArgumentEncoder& encoder, GKeyFile* keyFile)
</del><ins>+static void encodeGKeyFile(Encoder& encoder, GKeyFile* keyFile)
</ins><span class="cx"> {
</span><span class="cx"> gsize dataSize;
</span><span class="cx"> GUniquePtr<char> data(g_key_file_to_data(keyFile, &dataSize, 0));
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> encoder << DataReference(reinterpret_cast<uint8_t*>(data.get()), dataSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeGKeyFile(ArgumentDecoder& decoder, GUniquePtr<GKeyFile>& keyFile)
</del><ins>+static bool decodeGKeyFile(Decoder& decoder, GUniquePtr<GKeyFile>& keyFile)
</ins><span class="cx"> {
</span><span class="cx"> DataReference dataReference;
</span><span class="cx"> if (!decoder.decode(dataReference))
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void encode(ArgumentEncoder& encoder, GtkPrintSettings* printSettings)
</del><ins>+void encode(Encoder& encoder, GtkPrintSettings* printSettings)
</ins><span class="cx"> {
</span><span class="cx"> GUniquePtr<GKeyFile> keyFile(g_key_file_new());
</span><span class="cx"> gtk_print_settings_to_key_file(printSettings, keyFile.get(), "Print Settings");
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> encodeGKeyFile(encoder, keyFile.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool decode(ArgumentDecoder& decoder, GRefPtr<GtkPrintSettings>& printSettings)
</del><ins>+bool decode(Decoder& decoder, GRefPtr<GtkPrintSettings>& printSettings)
</ins><span class="cx"> {
</span><span class="cx"> GUniquePtr<GKeyFile> keyFile;
</span><span class="cx"> if (!decodeGKeyFile(decoder, keyFile))
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> return printSettings;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void encode(ArgumentEncoder& encoder, GtkPageSetup* pageSetup)
</del><ins>+void encode(Encoder& encoder, GtkPageSetup* pageSetup)
</ins><span class="cx"> {
</span><span class="cx"> GUniquePtr<GKeyFile> keyFile(g_key_file_new());
</span><span class="cx"> gtk_page_setup_to_key_file(pageSetup, keyFile.get(), "Page Setup");
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> encodeGKeyFile(encoder, keyFile.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool decode(ArgumentDecoder& decoder, GRefPtr<GtkPageSetup>& pageSetup)
</del><ins>+bool decode(Decoder& decoder, GRefPtr<GtkPageSetup>& pageSetup)
</ins><span class="cx"> {
</span><span class="cx"> GUniquePtr<GKeyFile> keyFile;
</span><span class="cx"> if (!decodeGKeyFile(decoder, keyFile))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkArgumentCodersGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -41,16 +41,16 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::DragData> {
</span><del>- static void encode(ArgumentEncoder&, const WebCore::DragData&);
- static bool decode(ArgumentDecoder&, WebCore::DragData&);
</del><ins>+ static void encode(Encoder&, const WebCore::DragData&);
+ static bool decode(Decoder&, WebCore::DragData&);
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void encode(ArgumentEncoder&, GtkPrintSettings*);
-bool decode(ArgumentDecoder&, GRefPtr<GtkPrintSettings>&);
</del><ins>+void encode(Encoder&, GtkPrintSettings*);
+bool decode(Decoder&, GRefPtr<GtkPrintSettings>&);
</ins><span class="cx">
</span><del>-void encode(ArgumentEncoder&, GtkPageSetup*);
-bool decode(ArgumentDecoder&, GRefPtr<GtkPageSetup>&);
</del><ins>+void encode(Encoder&, GtkPageSetup*);
+bool decode(Decoder&, GRefPtr<GtkPageSetup>&);
</ins><span class="cx">
</span><span class="cx"> } // namespace IPC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedsoupWebCoreArgumentCodersSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
</del><ins>+void ArgumentCoder<ResourceRequest>::encodePlatformData(Encoder& encoder, const ResourceRequest& resourceRequest)
</ins><span class="cx"> {
</span><span class="cx"> encoder << resourceRequest.url().string();
</span><span class="cx"> encoder << resourceRequest.httpMethod();
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> encoder << resourceRequest.initiatingPageID();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
</del><ins>+bool ArgumentCoder<ResourceRequest>::decodePlatformData(Decoder& decoder, ResourceRequest& resourceRequest)
</ins><span class="cx"> {
</span><span class="cx"> String url;
</span><span class="cx"> if (!decoder.decode(url))
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<CertificateInfo>::encode(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
</del><ins>+void ArgumentCoder<CertificateInfo>::encode(Encoder& encoder, const CertificateInfo& certificateInfo)
</ins><span class="cx"> {
</span><span class="cx"> if (!certificateInfo.certificate()) {
</span><span class="cx"> encoder << false;
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> encoder << static_cast<uint32_t>(certificateInfo.tlsErrors());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<CertificateInfo>::decode(ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
</del><ins>+bool ArgumentCoder<CertificateInfo>::decode(Decoder& decoder, CertificateInfo& certificateInfo)
</ins><span class="cx"> {
</span><span class="cx"> bool hasCertificate;
</span><span class="cx"> if (!decoder.decode(hasCertificate))
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
</del><ins>+void ArgumentCoder<ResourceError>::encodePlatformData(Encoder& encoder, const ResourceError& resourceError)
</ins><span class="cx"> {
</span><span class="cx"> encoder.encodeEnum(resourceError.type());
</span><span class="cx"> if (resourceError.isNull())
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> encoder << CertificateInfo(resourceError);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError)
</del><ins>+bool ArgumentCoder<ResourceError>::decodePlatformData(Decoder& decoder, ResourceError& resourceError)
</ins><span class="cx"> {
</span><span class="cx"> ResourceErrorBase::Type errorType;
</span><span class="cx"> if (!decoder.decodeEnum(errorType))
</span><span class="lines">@@ -236,23 +236,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<ProtectionSpace>::encodePlatformData(ArgumentEncoder&, const ProtectionSpace&)
</del><ins>+void ArgumentCoder<ProtectionSpace>::encodePlatformData(Encoder&, const ProtectionSpace&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<ProtectionSpace>::decodePlatformData(ArgumentDecoder&, ProtectionSpace&)
</del><ins>+bool ArgumentCoder<ProtectionSpace>::decodePlatformData(Decoder&, ProtectionSpace&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<Credential>::encodePlatformData(ArgumentEncoder&, const Credential&)
</del><ins>+void ArgumentCoder<Credential>::encodePlatformData(Encoder&, const Credential&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<Credential>::decodePlatformData(ArgumentDecoder&, Credential&)
</del><ins>+bool ArgumentCoder<Credential>::decodePlatformData(Decoder&, Credential&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLegacySessionStateCodingNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -27,8 +27,9 @@
</span><span class="cx"> #include "LegacySessionStateCoding.h"
</span><span class="cx">
</span><span class="cx"> #include "APIData.h"
</span><del>-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
</del><ins>+#include "DataReference.h"
+#include "Decoder.h"
+#include "Encoder.h"
</ins><span class="cx"> #include "SessionState.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx">
</span><span class="lines">@@ -36,7 +37,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Data> encodeLegacySessionState(const SessionState& sessionState)
</span><span class="cx"> {
</span><del>- IPC::ArgumentEncoder encoder;
</del><ins>+ // FIXME: I'm not sure whether these are the proper arguments for the encoder.
+ IPC::Encoder encoder("IPC", "LegacySessionState", 0);
</ins><span class="cx"> encoder << sessionState.backForwardListState;
</span><span class="cx"> encoder << sessionState.renderTreeSize;
</span><span class="cx"> encoder << sessionState.provisionalURL;
</span><span class="lines">@@ -45,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> bool decodeLegacySessionState(const uint8_t* data, size_t dataSize, SessionState& sessionState)
</span><span class="cx"> {
</span><del>- IPC::ArgumentDecoder decoder(data, dataSize);
</del><ins>+ IPC::Decoder decoder(IPC::DataReference(data, dataSize), Vector<IPC::Attachment>());
</ins><span class="cx"> if (!decoder.decode(sessionState.backForwardListState))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(sessionState.renderTreeSize))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBatteryManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h (204677 => 204678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h 2016-08-20 08:04:08 UTC (rev 204677)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h 2016-08-20 09:38:41 UTC (rev 204678)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> void derefWebContextSupplement() override;
</span><span class="cx">
</span><span class="cx"> // IPC::MessageReceiver
</span><del>- void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</del><ins>+ void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</ins><span class="cx">
</span><span class="cx"> void startUpdating();
</span><span class="cx"> void stopUpdating();
</span></span></pre>
</div>
</div>
</body>
</html>