Changeset 204678 in webkit


Ignore:
Timestamp:
Aug 20, 2016 2:38:41 AM (8 years ago)
Author:
jfernandez@igalia.com
Message:

[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:
Location:
trunk/Source/WebKit2
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/CMakeLists.txt

    r204676 r204678  
    221221    Platform/IPC/Connection.cpp
    222222    Platform/IPC/DataReference.cpp
     223    Platform/IPC/Decoder.cpp
    223224    Platform/IPC/Encoder.cpp
    224     Platform/IPC/Decoder.cpp
    225225    Platform/IPC/MessageReceiverMap.cpp
    226226    Platform/IPC/MessageSender.cpp
  • trunk/Source/WebKit2/ChangeLog

    r204677 r204678  
     12016-08-20  Javier Fernandez  <jfernandez@igalia.com>
     2
     3        [GTK] Unreviewed GTK build fix since r204665 and 204668
     4        https://bugs.webkit.org/show_bug.cgi?id=161020
     5
     6        * CMakeLists.txt:
     7        * Platform/IPC/MessageRecorder.cpp:
     8        (IPC::MessageRecorder::recordOutgoingMessage):
     9        * Platform/IPC/unix/ConnectionUnix.cpp:
     10        (IPC::Connection::processMessage):
     11        (IPC::Connection::sendOutgoingMessage):
     12        * Platform/unix/SharedMemoryUnix.cpp:
     13        (WebKit::SharedMemory::Handle::encode):
     14        (WebKit::SharedMemory::Handle::decode):
     15        * PlatformGTK.cmake:
     16        * Scripts/webkit/LegacyMessageReceiver-expected.cpp:
     17        (Messages::WebPage::GetPluginProcessConnection::DelayedReply::DelayedReply):
     18        (Messages::WebPage::TestMultipleAttributes::DelayedReply::DelayedReply):
     19        (WebKit::WebPage::didReceiveWebPageMessage):
     20        (WebKit::WebPage::didReceiveSyncWebPageMessage):
     21        * Scripts/webkit/LegacyMessages-expected.h:
     22        * Scripts/webkit/MessageReceiver-expected.cpp:
     23        (Messages::WebPage::GetPluginProcessConnection::DelayedReply::DelayedReply):
     24        (Messages::WebPage::TestMultipleAttributes::DelayedReply::DelayedReply):
     25        (WebKit::WebPage::didReceiveMessage):
     26        (WebKit::WebPage::didReceiveSyncMessage):
     27        * Scripts/webkit/Messages-expected.h:
     28        * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
     29        (IPC::ArgumentCoder<WebCore::FilterOperations>::encode):
     30        (IPC::ArgumentCoder<WebCore::FilterOperations>::decode):
     31        (IPC::ArgumentCoder<TransformOperations>::encode):
     32        (IPC::ArgumentCoder<TransformOperations>::decode):
     33        (IPC::encodeTimingFunction):
     34        (IPC::decodeTimingFunction):
     35        (IPC::ArgumentCoder<TextureMapperAnimation>::encode):
     36        (IPC::ArgumentCoder<TextureMapperAnimation>::decode):
     37        (IPC::ArgumentCoder<TextureMapperAnimations>::encode):
     38        (IPC::ArgumentCoder<TextureMapperAnimations>::decode):
     39        (IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode):
     40        (IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode):
     41        (IPC::ArgumentCoder<SurfaceUpdateInfo>::encode):
     42        (IPC::ArgumentCoder<SurfaceUpdateInfo>::decode):
     43        (IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::encode):
     44        (IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::decode):
     45        (IPC::ArgumentCoder<TileUpdateInfo>::encode):
     46        (IPC::ArgumentCoder<TileUpdateInfo>::decode):
     47        (IPC::ArgumentCoder<TileCreationInfo>::encode):
     48        (IPC::ArgumentCoder<TileCreationInfo>::decode):
     49        (IPC::encodeCoordinatedSurface):
     50        (IPC::decodeCoordinatedSurface):
     51        (IPC::ArgumentCoder<CoordinatedGraphicsState>::encode):
     52        (IPC::ArgumentCoder<CoordinatedGraphicsState>::decode):
     53        * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
     54        * Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp:
     55        (WebKit::WebCoordinatedSurface::Handle::encode):
     56        (WebKit::WebCoordinatedSurface::Handle::decode):
     57        * Shared/CoordinatedGraphics/WebCoordinatedSurface.h:
     58        * Shared/WebBatteryStatus.cpp:
     59        (WebKit::WebBatteryStatus::Data::encode):
     60        (WebKit::WebBatteryStatus::Data::decode):
     61        * Shared/WebBatteryStatus.h:
     62        * Shared/gtk/ArgumentCodersGtk.cpp:
     63        (IPC::encodeImage):
     64        (IPC::decodeImage):
     65        (IPC::encodeDataObject):
     66        (IPC::decodeDataObject):
     67        (IPC::ArgumentCoder<DragData>::encode):
     68        (IPC::ArgumentCoder<DragData>::decode):
     69        (IPC::encodeGKeyFile):
     70        (IPC::decodeGKeyFile):
     71        (IPC::encode):
     72        (IPC::decode):
     73        * Shared/gtk/ArgumentCodersGtk.h:
     74        * Shared/soup/WebCoreArgumentCodersSoup.cpp:
     75        (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
     76        (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
     77        (IPC::ArgumentCoder<CertificateInfo>::encode):
     78        (IPC::ArgumentCoder<CertificateInfo>::decode):
     79        (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
     80        (IPC::ArgumentCoder<ResourceError>::decodePlatformData):
     81        (IPC::ArgumentCoder<ProtectionSpace>::encodePlatformData):
     82        (IPC::ArgumentCoder<ProtectionSpace>::decodePlatformData):
     83        (IPC::ArgumentCoder<Credential>::encodePlatformData):
     84        (IPC::ArgumentCoder<Credential>::decodePlatformData):
     85        * UIProcess/LegacySessionStateCodingNone.cpp:
     86        (WebKit::encodeLegacySessionState):
     87        (WebKit::decodeLegacySessionState):
     88        * UIProcess/WebBatteryManagerProxy.h:
     89
    1902016-08-20  Yusuke Suzuki  <utatane.tea@gmail.com>
    291
  • trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp

    r204668 r204678  
    3030
    3131#include "Connection.h"
    32 #include "MessageDecoder.h"
    33 #include "MessageEncoder.h"
     32#include "Decoder.h"
     33#include "Encoder.h"
    3434#include "MessageRecorderProbes.h"
    3535#include <wtf/CurrentTime.h>
     
    4242}
    4343
    44 std::unique_ptr<MessageRecorder::MessageProcessingToken> MessageRecorder::recordOutgoingMessage(Connection& connection, MessageEncoder& encoder)
     44std::unique_ptr<MessageRecorder::MessageProcessingToken> MessageRecorder::recordOutgoingMessage(Connection& connection, Encoder& encoder)
    4545{
    4646    if (!isEnabled() || !connection.isValid())
  • trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp

    r203155 r204678  
    246246        messageBody = reinterpret_cast<uint8_t*>(oolMessageBody->data());
    247247
    248     auto decoder = std::make_unique<MessageDecoder>(DataReference(messageBody, messageInfo.bodySize()), WTFMove(attachments));
     248    auto decoder = std::make_unique<Decoder>(DataReference(messageBody, messageInfo.bodySize()), WTFMove(attachments));
    249249
    250250    processIncomingMessage(WTFMove(decoder));
     
    403403}
    404404
    405 bool Connection::sendOutgoingMessage(std::unique_ptr<MessageEncoder> encoder)
     405bool Connection::sendOutgoingMessage(std::unique_ptr<Encoder> encoder)
    406406{
    407407    COMPILE_ASSERT(sizeof(MessageInfo) + attachmentMaxAmount * sizeof(size_t) <= messageMaxSize, AttachmentsFitToMessageInline);
  • trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp

    r203954 r204678  
    3030#include "SharedMemory.h"
    3131
    32 #include "ArgumentDecoder.h"
    33 #include "ArgumentEncoder.h"
     32#include "Decoder.h"
     33#include "Encoder.h"
    3434#include <errno.h>
    3535#include <fcntl.h>
     
    6565}
    6666
    67 void SharedMemory::Handle::encode(IPC::ArgumentEncoder& encoder) const
     67void SharedMemory::Handle::encode(IPC::Encoder& encoder) const
    6868{
    6969    encoder << releaseAttachment();
    7070}
    7171
    72 bool SharedMemory::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
     72bool SharedMemory::Handle::decode(IPC::Decoder& decoder, Handle& handle)
    7373{
    7474    ASSERT_ARG(handle, handle.isNull());
  • trunk/Source/WebKit2/Scripts/webkit/LegacyMessageReceiver-expected.cpp

    r194496 r204678  
    3838#include "MachPort.h"
    3939#endif
    40 #include "MessageDecoder.h"
     40#include "Decoder.h"
    4141#include "Plugin.h"
    4242#include "WebCoreArgumentCoders.h"
     
    6060namespace WebPage {
    6161
    62 GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
     62GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)
    6363    : m_connection(connection)
    6464    , m_encoder(WTFMove(encoder))
     
    8080}
    8181
    82 TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
     82TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)
    8383    : m_connection(connection)
    8484    , m_encoder(WTFMove(encoder))
     
    105105namespace WebKit {
    106106
    107 void WebPage::didReceiveWebPageMessage(IPC::Connection*, IPC::MessageDecoder& decoder)
     107void WebPage::didReceiveWebPageMessage(IPC::Connection*, IPC::Decoder& decoder)
    108108{
    109109    if (decoder.messageName() == Messages::WebPage::LoadURL::name()) {
     
    189189}
    190190
    191 void WebPage::didReceiveSyncWebPageMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
     191void WebPage::didReceiveSyncWebPageMessage(IPC::Connection* connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
    192192{
    193193    if (decoder.messageName() == Messages::WebPage::CreatePlugin::name()) {
  • trunk/Source/WebKit2/Scripts/webkit/LegacyMessages-expected.h

    r180441 r204678  
    3030#include "Arguments.h"
    3131#include "Connection.h"
    32 #include "MessageEncoder.h"
     32#include "Encoder.h"
    3333#include "Plugin.h"
    3434#include "StringReference.h"
     
    366366
    367367    struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
    368         DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
     368        DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);
    369369        ~DelayedReply();
    370370
     
    373373    private:
    374374        RefPtr<IPC::Connection> m_connection;
    375         std::unique_ptr<IPC::MessageEncoder> m_encoder;
     375        std::unique_ptr<IPC::Encoder> m_encoder;
    376376    };
    377377
     
    400400
    401401    struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
    402         DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
     402        DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);
    403403        ~DelayedReply();
    404404
     
    407407    private:
    408408        RefPtr<IPC::Connection> m_connection;
    409         std::unique_ptr<IPC::MessageEncoder> m_encoder;
     409        std::unique_ptr<IPC::Encoder> m_encoder;
    410410    };
    411411
  • trunk/Source/WebKit2/Scripts/webkit/MessageReceiver-expected.cpp

    r194496 r204678  
    3838#include "MachPort.h"
    3939#endif
    40 #include "MessageDecoder.h"
     40#include "Decoder.h"
    4141#include "Plugin.h"
    4242#include "WebCoreArgumentCoders.h"
     
    6060namespace WebPage {
    6161
    62 GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
     62GetPluginProcessConnection::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)
    6363    : m_connection(connection)
    6464    , m_encoder(WTFMove(encoder))
     
    8080}
    8181
    82 TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::MessageEncoder> encoder)
     82TestMultipleAttributes::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)
    8383    : m_connection(connection)
    8484    , m_encoder(WTFMove(encoder))
     
    105105namespace WebKit {
    106106
    107 void WebPage::didReceiveMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder)
     107void WebPage::didReceiveMessage(IPC::Connection* connection, IPC::Decoder& decoder)
    108108{
    109109    if (decoder.messageName() == Messages::WebPage::LoadURL::name()) {
     
    190190}
    191191
    192 void WebPage::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
     192void WebPage::didReceiveSyncMessage(IPC::Connection* connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
    193193{
    194194    if (decoder.messageName() == Messages::WebPage::CreatePlugin::name()) {
  • trunk/Source/WebKit2/Scripts/webkit/Messages-expected.h

    r180441 r204678  
    3030#include "Arguments.h"
    3131#include "Connection.h"
    32 #include "MessageEncoder.h"
     32#include "Encoder.h"
    3333#include "Plugin.h"
    3434#include "StringReference.h"
     
    366366
    367367    struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
    368         DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
     368        DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);
    369369        ~DelayedReply();
    370370
     
    373373    private:
    374374        RefPtr<IPC::Connection> m_connection;
    375         std::unique_ptr<IPC::MessageEncoder> m_encoder;
     375        std::unique_ptr<IPC::Encoder> m_encoder;
    376376    };
    377377
     
    400400
    401401    struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {
    402         DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::MessageEncoder>);
     402        DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);
    403403        ~DelayedReply();
    404404
     
    407407    private:
    408408        RefPtr<IPC::Connection> m_connection;
    409         std::unique_ptr<IPC::MessageEncoder> m_encoder;
     409        std::unique_ptr<IPC::Encoder> m_encoder;
    410410    };
    411411
  • trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp

    r201759 r204678  
    6161namespace IPC {
    6262
    63 void ArgumentCoder<WebCore::FilterOperations>::encode(ArgumentEncoder& encoder, const WebCore::FilterOperations& filters)
     63void ArgumentCoder<WebCore::FilterOperations>::encode(Encoder& encoder, const WebCore::FilterOperations& filters)
    6464{
    6565    encoder << static_cast<uint32_t>(filters.size());
     
    100100}
    101101
    102 bool ArgumentCoder<WebCore::FilterOperations>::decode(ArgumentDecoder& decoder, WebCore::FilterOperations& filters)
     102bool ArgumentCoder<WebCore::FilterOperations>::decode(Decoder& decoder, WebCore::FilterOperations& filters)
    103103{
    104104    uint32_t size;
     
    169169}
    170170
    171 void ArgumentCoder<TransformOperations>::encode(ArgumentEncoder& encoder, const TransformOperations& transformOperations)
     171void ArgumentCoder<TransformOperations>::encode(Encoder& encoder, const TransformOperations& transformOperations)
    172172{
    173173    encoder << static_cast<uint32_t>(transformOperations.size());
     
    235235}
    236236
    237 bool ArgumentCoder<TransformOperations>::decode(ArgumentDecoder& decoder, TransformOperations& transformOperations)
     237bool ArgumentCoder<TransformOperations>::decode(Decoder& decoder, TransformOperations& transformOperations)
    238238{
    239239    uint32_t operationsSize;
     
    336336}
    337337
    338 static void encodeTimingFunction(ArgumentEncoder& encoder, const TimingFunction* timingFunction)
     338static void encodeTimingFunction(Encoder& encoder, const TimingFunction* timingFunction)
    339339{
    340340    if (!timingFunction) {
     
    377377}
    378378
    379 bool decodeTimingFunction(ArgumentDecoder& decoder, RefPtr<TimingFunction>& timingFunction)
     379bool decodeTimingFunction(Decoder& decoder, RefPtr<TimingFunction>& timingFunction)
    380380{
    381381    TimingFunction::TimingFunctionType type;
     
    444444}
    445445
    446 void ArgumentCoder<TextureMapperAnimation>::encode(ArgumentEncoder& encoder, const TextureMapperAnimation& animation)
     446void ArgumentCoder<TextureMapperAnimation>::encode(Encoder& encoder, const TextureMapperAnimation& animation)
    447447{
    448448    encoder << animation.name();
     
    483483}
    484484
    485 bool ArgumentCoder<TextureMapperAnimation>::decode(ArgumentDecoder& decoder, TextureMapperAnimation& animation)
     485bool ArgumentCoder<TextureMapperAnimation>::decode(Decoder& decoder, TextureMapperAnimation& animation)
    486486{
    487487    String name;
     
    576576}
    577577
    578 void ArgumentCoder<TextureMapperAnimations>::encode(ArgumentEncoder& encoder, const TextureMapperAnimations& animations)
     578void ArgumentCoder<TextureMapperAnimations>::encode(Encoder& encoder, const TextureMapperAnimations& animations)
    579579{
    580580    encoder << animations.animations();
    581581}
    582582
    583 bool ArgumentCoder<TextureMapperAnimations>::decode(ArgumentDecoder& decoder, TextureMapperAnimations& animations)
     583bool ArgumentCoder<TextureMapperAnimations>::decode(Decoder& decoder, TextureMapperAnimations& animations)
    584584{
    585585    return decoder.decode(animations.animations());
     
    587587
    588588#if USE(GRAPHICS_SURFACE)
    589 void ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode(ArgumentEncoder& encoder, const WebCore::GraphicsSurfaceToken& token)
     589void ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode(Encoder& encoder, const WebCore::GraphicsSurfaceToken& token)
    590590{
    591591#if OS(DARWIN)
     
    597597}
    598598
    599 bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(ArgumentDecoder& decoder, WebCore::GraphicsSurfaceToken& token)
     599bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(Decoder& decoder, WebCore::GraphicsSurfaceToken& token)
    600600{
    601601#if OS(DARWIN)
     
    615615#endif
    616616
    617 void ArgumentCoder<SurfaceUpdateInfo>::encode(ArgumentEncoder& encoder, const SurfaceUpdateInfo& surfaceUpdateInfo)
     617void ArgumentCoder<SurfaceUpdateInfo>::encode(Encoder& encoder, const SurfaceUpdateInfo& surfaceUpdateInfo)
    618618{
    619619    SimpleArgumentCoder<SurfaceUpdateInfo>::encode(encoder, surfaceUpdateInfo);
    620620}
    621621
    622 bool ArgumentCoder<SurfaceUpdateInfo>::decode(ArgumentDecoder& decoder, SurfaceUpdateInfo& surfaceUpdateInfo)
     622bool ArgumentCoder<SurfaceUpdateInfo>::decode(Decoder& decoder, SurfaceUpdateInfo& surfaceUpdateInfo)
    623623{
    624624    return SimpleArgumentCoder<SurfaceUpdateInfo>::decode(decoder, surfaceUpdateInfo);
    625625}
    626626
    627 void ArgumentCoder<CoordinatedGraphicsLayerState>::encode(ArgumentEncoder& encoder, const CoordinatedGraphicsLayerState& state)
     627void ArgumentCoder<CoordinatedGraphicsLayerState>::encode(Encoder& encoder, const CoordinatedGraphicsLayerState& state)
    628628{
    629629    encoder << state.changeMask;
     
    706706}
    707707
    708 bool ArgumentCoder<CoordinatedGraphicsLayerState>::decode(ArgumentDecoder& decoder, CoordinatedGraphicsLayerState& state)
     708bool ArgumentCoder<CoordinatedGraphicsLayerState>::decode(Decoder& decoder, CoordinatedGraphicsLayerState& state)
    709709{
    710710    if (!decoder.decode(state.changeMask))
     
    803803}
    804804
    805 void ArgumentCoder<TileUpdateInfo>::encode(ArgumentEncoder& encoder, const TileUpdateInfo& updateInfo)
     805void ArgumentCoder<TileUpdateInfo>::encode(Encoder& encoder, const TileUpdateInfo& updateInfo)
    806806{
    807807    SimpleArgumentCoder<TileUpdateInfo>::encode(encoder, updateInfo);
    808808}
    809809
    810 bool ArgumentCoder<TileUpdateInfo>::decode(ArgumentDecoder& decoder, TileUpdateInfo& updateInfo)
     810bool ArgumentCoder<TileUpdateInfo>::decode(Decoder& decoder, TileUpdateInfo& updateInfo)
    811811{
    812812    return SimpleArgumentCoder<TileUpdateInfo>::decode(decoder, updateInfo);
    813813}
    814814
    815 void ArgumentCoder<TileCreationInfo>::encode(ArgumentEncoder& encoder, const TileCreationInfo& updateInfo)
     815void ArgumentCoder<TileCreationInfo>::encode(Encoder& encoder, const TileCreationInfo& updateInfo)
    816816{
    817817    SimpleArgumentCoder<TileCreationInfo>::encode(encoder, updateInfo);
    818818}
    819819
    820 bool ArgumentCoder<TileCreationInfo>::decode(ArgumentDecoder& decoder, TileCreationInfo& updateInfo)
     820bool ArgumentCoder<TileCreationInfo>::decode(Decoder& decoder, TileCreationInfo& updateInfo)
    821821{
    822822    return SimpleArgumentCoder<TileCreationInfo>::decode(decoder, updateInfo);
    823823}
    824824
    825 static void encodeCoordinatedSurface(ArgumentEncoder& encoder, const RefPtr<CoordinatedSurface>& surface)
     825static void encodeCoordinatedSurface(Encoder& encoder, const RefPtr<CoordinatedSurface>& surface)
    826826{
    827827    bool isValidSurface = false;
     
    842842}
    843843
    844 static bool decodeCoordinatedSurface(ArgumentDecoder& decoder, RefPtr<CoordinatedSurface>& surface)
     844static bool decodeCoordinatedSurface(Decoder& decoder, RefPtr<CoordinatedSurface>& surface)
    845845{
    846846    bool isValidSurface;
     
    859859}
    860860
    861 void ArgumentCoder<CoordinatedGraphicsState>::encode(ArgumentEncoder& encoder, const CoordinatedGraphicsState& state)
     861void ArgumentCoder<CoordinatedGraphicsState>::encode(Encoder& encoder, const CoordinatedGraphicsState& state)
    862862{
    863863    encoder << state.rootCompositingLayer;
     
    890890}
    891891
    892 bool ArgumentCoder<CoordinatedGraphicsState>::decode(ArgumentDecoder& decoder, CoordinatedGraphicsState& state)
     892bool ArgumentCoder<CoordinatedGraphicsState>::decode(Decoder& decoder, CoordinatedGraphicsState& state)
    893893{
    894894    if (!decoder.decode(state.rootCompositingLayer))
  • trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h

    r178182 r204678  
    5555
    5656template<> struct ArgumentCoder<WebCore::FilterOperations> {
    57     static void encode(ArgumentEncoder&, const WebCore::FilterOperations&);
    58     static bool decode(ArgumentDecoder&, WebCore::FilterOperations&);
     57    static void encode(Encoder&, const WebCore::FilterOperations&);
     58    static bool decode(Decoder&, WebCore::FilterOperations&);
    5959};
    6060
    6161template<> struct ArgumentCoder<WebCore::TransformOperations> {
    62     static void encode(ArgumentEncoder&, const WebCore::TransformOperations&);
    63     static bool decode(ArgumentDecoder&, WebCore::TransformOperations&);
     62    static void encode(Encoder&, const WebCore::TransformOperations&);
     63    static bool decode(Decoder&, WebCore::TransformOperations&);
    6464};
    6565
    6666template<> struct ArgumentCoder<WebCore::TextureMapperAnimations> {
    67     static void encode(ArgumentEncoder&, const WebCore::TextureMapperAnimations&);
    68     static bool decode(ArgumentDecoder&, WebCore::TextureMapperAnimations&);
     67    static void encode(Encoder&, const WebCore::TextureMapperAnimations&);
     68    static bool decode(Decoder&, WebCore::TextureMapperAnimations&);
    6969};
    7070
    7171template<> struct ArgumentCoder<WebCore::TextureMapperAnimation> {
    72     static void encode(ArgumentEncoder&, const WebCore::TextureMapperAnimation&);
    73     static bool decode(ArgumentDecoder&, WebCore::TextureMapperAnimation&);
     72    static void encode(Encoder&, const WebCore::TextureMapperAnimation&);
     73    static bool decode(Decoder&, WebCore::TextureMapperAnimation&);
    7474};
    7575
    7676#if USE(GRAPHICS_SURFACE)
    7777template<> struct ArgumentCoder<WebCore::GraphicsSurfaceToken> {
    78     static void encode(ArgumentEncoder&, const WebCore::GraphicsSurfaceToken&);
    79     static bool decode(ArgumentDecoder&, WebCore::GraphicsSurfaceToken&);
     78    static void encode(Encoder&, const WebCore::GraphicsSurfaceToken&);
     79    static bool decode(Decoder&, WebCore::GraphicsSurfaceToken&);
    8080};
    8181#endif
    8282
    8383template<> struct ArgumentCoder<WebCore::SurfaceUpdateInfo> {
    84     static void encode(ArgumentEncoder&, const WebCore::SurfaceUpdateInfo&);
    85     static bool decode(ArgumentDecoder&, WebCore::SurfaceUpdateInfo&);
     84    static void encode(Encoder&, const WebCore::SurfaceUpdateInfo&);
     85    static bool decode(Decoder&, WebCore::SurfaceUpdateInfo&);
    8686};
    8787
    8888template<> struct ArgumentCoder<WebCore::CoordinatedGraphicsLayerState> {
    89     static void encode(ArgumentEncoder&, const WebCore::CoordinatedGraphicsLayerState&);
    90     static bool decode(ArgumentDecoder&, WebCore::CoordinatedGraphicsLayerState&);
     89    static void encode(Encoder&, const WebCore::CoordinatedGraphicsLayerState&);
     90    static bool decode(Decoder&, WebCore::CoordinatedGraphicsLayerState&);
    9191};
    9292
    9393template<> struct ArgumentCoder<WebCore::TileUpdateInfo> {
    94     static void encode(ArgumentEncoder&, const WebCore::TileUpdateInfo&);
    95     static bool decode(ArgumentDecoder&, WebCore::TileUpdateInfo&);
     94    static void encode(Encoder&, const WebCore::TileUpdateInfo&);
     95    static bool decode(Decoder&, WebCore::TileUpdateInfo&);
    9696};
    9797
    9898template<> struct ArgumentCoder<WebCore::TileCreationInfo> {
    99     static void encode(ArgumentEncoder&, const WebCore::TileCreationInfo&);
    100     static bool decode(ArgumentDecoder&, WebCore::TileCreationInfo&);
     99    static void encode(Encoder&, const WebCore::TileCreationInfo&);
     100    static bool decode(Decoder&, WebCore::TileCreationInfo&);
    101101};
    102102
    103103template<> struct ArgumentCoder<WebCore::CoordinatedGraphicsState> {
    104     static void encode(ArgumentEncoder&, const WebCore::CoordinatedGraphicsState&);
    105     static bool decode(ArgumentDecoder&, WebCore::CoordinatedGraphicsState&);
     104    static void encode(Encoder&, const WebCore::CoordinatedGraphicsState&);
     105    static bool decode(Decoder&, WebCore::CoordinatedGraphicsState&);
    106106};
    107107
  • trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp

    r202812 r204678  
    4141}
    4242
    43 void WebCoordinatedSurface::Handle::encode(IPC::ArgumentEncoder& encoder) const
     43void WebCoordinatedSurface::Handle::encode(IPC::Encoder& encoder) const
    4444{
    4545    encoder << m_size << m_flags;
     
    5252}
    5353
    54 bool WebCoordinatedSurface::Handle::decode(IPC::ArgumentDecoder& decoder, Handle& handle)
     54bool WebCoordinatedSurface::Handle::decode(IPC::Decoder& decoder, Handle& handle)
    5555{
    5656    if (!decoder.decode(handle.m_size))
  • trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h

    r202812 r204678  
    4444        Handle();
    4545
    46         void encode(IPC::ArgumentEncoder&) const;
    47         static bool decode(IPC::ArgumentDecoder&, Handle&);
     46        void encode(IPC::Encoder&) const;
     47        static bool decode(IPC::Decoder&, Handle&);
    4848
    4949#if USE(GRAPHICS_SURFACE)
  • trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp

    r161156 r204678  
    4646}
    4747
    48 void WebBatteryStatus::Data::encode(IPC::ArgumentEncoder& encoder) const
     48void WebBatteryStatus::Data::encode(IPC::Encoder& encoder) const
    4949{
    5050    encoder << isCharging;
     
    5454}
    5555
    56 bool WebBatteryStatus::Data::decode(IPC::ArgumentDecoder& decoder, Data& result)
     56bool WebBatteryStatus::Data::decode(IPC::Decoder& decoder, Data& result)
    5757{
    5858    if (!decoder.decode(result.isCharging))
  • trunk/Source/WebKit2/Shared/WebBatteryStatus.h

    r204466 r204678  
    3030
    3131#include "APIObject.h"
    32 #include "ArgumentDecoder.h"
    33 #include "ArgumentEncoder.h"
     32#include "Decoder.h"
     33#include "Encoder.h"
    3434
    3535namespace WebKit {
     
    3838public:
    3939    struct Data {
    40         void encode(IPC::ArgumentEncoder&) const;
    41         static bool decode(IPC::ArgumentDecoder&, Data&);
     40        void encode(IPC::Encoder&) const;
     41        static bool decode(IPC::Decoder&, Data&);
    4242
    4343        bool isCharging;
  • trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp

    r202242 r204678  
    4242namespace IPC {
    4343
    44 static void encodeImage(ArgumentEncoder& encoder, const GdkPixbuf* pixbuf)
     44static void encodeImage(Encoder& encoder, const GdkPixbuf* pixbuf)
    4545{
    4646    IntSize imageSize(gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
     
    5858}
    5959
    60 static bool decodeImage(ArgumentDecoder& decoder, GRefPtr<GdkPixbuf>& pixbuf)
     60static bool decodeImage(Decoder& decoder, GRefPtr<GdkPixbuf>& pixbuf)
    6161{
    6262    ShareableBitmap::Handle handle;
     
    8383}
    8484
    85 static void encodeDataObject(ArgumentEncoder& encoder, const DataObjectGtk* dataObject)
     85static void encodeDataObject(Encoder& encoder, const DataObjectGtk* dataObject)
    8686{
    8787    bool hasText = dataObject->hasText();
     
    116116}
    117117
    118 static bool decodeDataObject(ArgumentDecoder& decoder, RefPtr<DataObjectGtk>& dataObject)
     118static bool decodeDataObject(Decoder& decoder, RefPtr<DataObjectGtk>& dataObject)
    119119{
    120120    RefPtr<DataObjectGtk> data = DataObjectGtk::create();
     
    189189
    190190#if ENABLE(DRAG_SUPPORT)
    191 void ArgumentCoder<DragData>::encode(ArgumentEncoder& encoder, const DragData& dragData)
     191void ArgumentCoder<DragData>::encode(Encoder& encoder, const DragData& dragData)
    192192{
    193193    encoder << dragData.clientPosition();
     
    202202}
    203203
    204 bool ArgumentCoder<DragData>::decode(ArgumentDecoder& decoder, DragData& dragData)
     204bool ArgumentCoder<DragData>::decode(Decoder& decoder, DragData& dragData)
    205205{
    206206    IntPoint clientPosition;
     
    237237#endif // ENABLE(DRAG_SUPPORT)
    238238
    239 static void encodeGKeyFile(ArgumentEncoder& encoder, GKeyFile* keyFile)
     239static void encodeGKeyFile(Encoder& encoder, GKeyFile* keyFile)
    240240{
    241241    gsize dataSize;
     
    244244}
    245245
    246 static bool decodeGKeyFile(ArgumentDecoder& decoder, GUniquePtr<GKeyFile>& keyFile)
     246static bool decodeGKeyFile(Decoder& decoder, GUniquePtr<GKeyFile>& keyFile)
    247247{
    248248    DataReference dataReference;
     
    262262}
    263263
    264 void encode(ArgumentEncoder& encoder, GtkPrintSettings* printSettings)
     264void encode(Encoder& encoder, GtkPrintSettings* printSettings)
    265265{
    266266    GUniquePtr<GKeyFile> keyFile(g_key_file_new());
     
    269269}
    270270
    271 bool decode(ArgumentDecoder& decoder, GRefPtr<GtkPrintSettings>& printSettings)
     271bool decode(Decoder& decoder, GRefPtr<GtkPrintSettings>& printSettings)
    272272{
    273273    GUniquePtr<GKeyFile> keyFile;
     
    285285}
    286286
    287 void encode(ArgumentEncoder& encoder, GtkPageSetup* pageSetup)
     287void encode(Encoder& encoder, GtkPageSetup* pageSetup)
    288288{
    289289    GUniquePtr<GKeyFile> keyFile(g_key_file_new());
     
    292292}
    293293
    294 bool decode(ArgumentDecoder& decoder, GRefPtr<GtkPageSetup>& pageSetup)
     294bool decode(Decoder& decoder, GRefPtr<GtkPageSetup>& pageSetup)
    295295{
    296296    GUniquePtr<GKeyFile> keyFile;
  • trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h

    r185502 r204678  
    4242#if ENABLE(DRAG_SUPPORT)
    4343template<> struct ArgumentCoder<WebCore::DragData> {
    44     static void encode(ArgumentEncoder&, const WebCore::DragData&);
    45     static bool decode(ArgumentDecoder&, WebCore::DragData&);
     44    static void encode(Encoder&, const WebCore::DragData&);
     45    static bool decode(Decoder&, WebCore::DragData&);
    4646};
    4747#endif
    4848
    49 void encode(ArgumentEncoder&, GtkPrintSettings*);
    50 bool decode(ArgumentDecoder&, GRefPtr<GtkPrintSettings>&);
     49void encode(Encoder&, GtkPrintSettings*);
     50bool decode(Decoder&, GRefPtr<GtkPrintSettings>&);
    5151
    52 void encode(ArgumentEncoder&, GtkPageSetup*);
    53 bool decode(ArgumentDecoder&, GRefPtr<GtkPageSetup>&);
     52void encode(Encoder&, GtkPageSetup*);
     53bool decode(Decoder&, GRefPtr<GtkPageSetup>&);
    5454
    5555} // namespace IPC
  • trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp

    r201856 r204678  
    4040namespace IPC {
    4141
    42 void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
     42void ArgumentCoder<ResourceRequest>::encodePlatformData(Encoder& encoder, const ResourceRequest& resourceRequest)
    4343{
    4444    encoder << resourceRequest.url().string();
     
    6565}
    6666
    67 bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
     67bool ArgumentCoder<ResourceRequest>::decodePlatformData(Decoder& decoder, ResourceRequest& resourceRequest)
    6868{
    6969    String url;
     
    135135}
    136136
    137 void ArgumentCoder<CertificateInfo>::encode(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
     137void ArgumentCoder<CertificateInfo>::encode(Encoder& encoder, const CertificateInfo& certificateInfo)
    138138{
    139139    if (!certificateInfo.certificate()) {
     
    155155}
    156156
    157 bool ArgumentCoder<CertificateInfo>::decode(ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
     157bool ArgumentCoder<CertificateInfo>::decode(Decoder& decoder, CertificateInfo& certificateInfo)
    158158{
    159159    bool hasCertificate;
     
    185185}
    186186
    187 void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
     187void ArgumentCoder<ResourceError>::encodePlatformData(Encoder& encoder, const ResourceError& resourceError)
    188188{
    189189    encoder.encodeEnum(resourceError.type());
     
    199199}
    200200
    201 bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError)
     201bool ArgumentCoder<ResourceError>::decodePlatformData(Decoder& decoder, ResourceError& resourceError)
    202202{
    203203    ResourceErrorBase::Type errorType;
     
    237237}
    238238
    239 void ArgumentCoder<ProtectionSpace>::encodePlatformData(ArgumentEncoder&, const ProtectionSpace&)
    240 {
    241     ASSERT_NOT_REACHED();
    242 }
    243 
    244 bool ArgumentCoder<ProtectionSpace>::decodePlatformData(ArgumentDecoder&, ProtectionSpace&)
     239void ArgumentCoder<ProtectionSpace>::encodePlatformData(Encoder&, const ProtectionSpace&)
     240{
     241    ASSERT_NOT_REACHED();
     242}
     243
     244bool ArgumentCoder<ProtectionSpace>::decodePlatformData(Decoder&, ProtectionSpace&)
    245245{
    246246    ASSERT_NOT_REACHED();
     
    248248}
    249249
    250 void ArgumentCoder<Credential>::encodePlatformData(ArgumentEncoder&, const Credential&)
    251 {
    252     ASSERT_NOT_REACHED();
    253 }
    254 
    255 bool ArgumentCoder<Credential>::decodePlatformData(ArgumentDecoder&, Credential&)
     250void ArgumentCoder<Credential>::encodePlatformData(Encoder&, const Credential&)
     251{
     252    ASSERT_NOT_REACHED();
     253}
     254
     255bool ArgumentCoder<Credential>::decodePlatformData(Decoder&, Credential&)
    256256{
    257257    ASSERT_NOT_REACHED();
  • trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp

    r191103 r204678  
    2828
    2929#include "APIData.h"
    30 #include "ArgumentDecoder.h"
    31 #include "ArgumentEncoder.h"
     30#include "DataReference.h"
     31#include "Decoder.h"
     32#include "Encoder.h"
    3233#include "SessionState.h"
    3334#include "WebCoreArgumentCoders.h"
     
    3738RefPtr<API::Data> encodeLegacySessionState(const SessionState& sessionState)
    3839{
    39     IPC::ArgumentEncoder encoder;
     40    // FIXME: I'm not sure whether these are the proper arguments for the encoder.
     41    IPC::Encoder encoder("IPC", "LegacySessionState", 0);
    4042    encoder << sessionState.backForwardListState;
    4143    encoder << sessionState.renderTreeSize;
     
    4648bool decodeLegacySessionState(const uint8_t* data, size_t dataSize, SessionState& sessionState)
    4749{
    48     IPC::ArgumentDecoder decoder(data, dataSize);
     50    IPC::Decoder decoder(IPC::DataReference(data, dataSize), Vector<IPC::Attachment>());
    4951    if (!decoder.decode(sessionState.backForwardListState))
    5052        return false;
  • trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h

    r197563 r204678  
    6565
    6666    // IPC::MessageReceiver
    67     void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
     67    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
    6868
    6969    void startUpdating();
Note: See TracChangeset for help on using the changeset viewer.