Changeset 84293 in webkit


Ignore:
Timestamp:
Apr 19, 2011 2:16:45 PM (13 years ago)
Author:
andersca@apple.com
Message:

2011-04-19 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Add syncMessageSendTimedOut CoreIPC Connection::Client member function
​https://bugs.webkit.org/show_bug.cgi?id=58928

  • Platform/CoreIPC/Connection.cpp: (CoreIPC::Connection::waitForSyncReply): Call syncMessageSendTimedOut.
  • Platform/CoreIPC/Connection.h: Add syncMessageSendTimedOut to Connection::Client.
  • PluginProcess/PluginProcess.cpp:
  • PluginProcess/PluginProcess.h:
  • PluginProcess/WebProcessConnection.cpp:
  • PluginProcess/WebProcessConnection.h:
  • UIProcess/Plugins/PluginProcessProxy.cpp:
  • UIProcess/Plugins/PluginProcessProxy.h:
  • UIProcess/WebProcessProxy.cpp:
  • UIProcess/WebProcessProxy.h:
  • WebProcess/Plugins/PluginProcessConnection.cpp:
  • WebProcess/Plugins/PluginProcessConnection.h:
  • WebProcess/WebProcess.cpp:
  • WebProcess/WebProcess.h: Add syncMessageSendTimedOut stubs.
Location:
trunk/Source/WebKit2
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r84288 r84293  
     12011-04-19  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Add syncMessageSendTimedOut CoreIPC Connection::Client member function
     6        https://bugs.webkit.org/show_bug.cgi?id=58928
     7
     8        * Platform/CoreIPC/Connection.cpp:
     9        (CoreIPC::Connection::waitForSyncReply):
     10        Call syncMessageSendTimedOut.
     11
     12        * Platform/CoreIPC/Connection.h:
     13        Add syncMessageSendTimedOut to Connection::Client.
     14
     15        * PluginProcess/PluginProcess.cpp:
     16        * PluginProcess/PluginProcess.h:
     17        * PluginProcess/WebProcessConnection.cpp:
     18        * PluginProcess/WebProcessConnection.h:
     19        * UIProcess/Plugins/PluginProcessProxy.cpp:
     20        * UIProcess/Plugins/PluginProcessProxy.h:
     21        * UIProcess/WebProcessProxy.cpp:
     22        * UIProcess/WebProcessProxy.h:
     23        * WebProcess/Plugins/PluginProcessConnection.cpp:
     24        * WebProcess/Plugins/PluginProcessConnection.h:
     25        * WebProcess/WebProcess.cpp:
     26        * WebProcess/WebProcess.h:
     27        Add syncMessageSendTimedOut stubs.
     28
    1292011-04-19  Anders Carlsson  <andersca@apple.com>
    230

  • trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp

    r84288 r84293  
    443443
    444444    // We timed out.
     445    if (m_client)
     446        m_client->syncMessageSendTimedOut(this);
     447
    445448    return 0;
    446449}

  • trunk/Source/WebKit2/Platform/CoreIPC/Connection.h

    r84288 r84293  
    9494        virtual void didClose(Connection*) = 0;
    9595        virtual void didReceiveInvalidMessage(Connection*, MessageID) = 0;
     96        virtual void syncMessageSendTimedOut(Connection*) = 0;
    9697
    9798#if PLATFORM(WIN)

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

    r84288 r84293  
    125125}
    126126
     127void PluginProcess::syncMessageSendTimedOut(CoreIPC::Connection*)
     128{
     129}
     130
    127131void PluginProcess::initializePluginProcess(const PluginProcessCreationParameters& parameters)
    128132{

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.h

    r84288 r84293  
    7272    virtual void didClose(CoreIPC::Connection*);
    7373    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
     74    virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    7475
    7576    // Message handlers.

  • trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp

    r83842 r84293  
    158158}
    159159
     160void WebProcessConnection::syncMessageSendTimedOut(CoreIPC::Connection*)
     161{
     162}
     163
    160164void WebProcessConnection::createPlugin(uint64_t pluginInstanceID, const Plugin::Parameters& parameters, const String& userAgent, bool isPrivateBrowsingEnabled, bool isAcceleratedCompositingEnabled, bool& result, uint32_t& remoteLayerClientID)
    161165{

  • trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h

    r81370 r84293  
    6262    virtual void didClose(CoreIPC::Connection*);
    6363    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
     64    virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    6465
    6566    // Message handlers.

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp

    r84174 r84293  
    168168}
    169169
     170void PluginProcessProxy::syncMessageSendTimedOut(CoreIPC::Connection*)
     171{
     172}
     173
    170174void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier connectionIdentifier)
    171175{

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

    r84174 r84293  
    8282    virtual void didClose(CoreIPC::Connection*);
    8383    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
     84    virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    8485
    8586    // ProcessLauncher::Client

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r84181 r84293  
    300300}
    301301
     302void WebProcessProxy::syncMessageSendTimedOut(CoreIPC::Connection*)
     303{
     304}
     305
    302306void WebProcessProxy::didBecomeUnresponsive(ResponsivenessTimer*)
    303307{

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

    r84174 r84293  
    126126
    127127    // CoreIPC::Connection::Client
    128     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
    129     CoreIPC::SyncReplyMode didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
    130     void didClose(CoreIPC::Connection*);
    131     void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
     128    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
     129    virtual CoreIPC::SyncReplyMode didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
     130    virtual void didClose(CoreIPC::Connection*);
     131    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
     132    virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
     133
    132134#if PLATFORM(WIN)
    133135    Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp

    r81370 r84293  
    117117}
    118118
     119void PluginProcessConnection::syncMessageSendTimedOut(CoreIPC::Connection*)
     120{
     121}
     122
    119123} // namespace WebKit
    120124

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h

    r71081 r84293  
    6767    virtual void didClose(CoreIPC::Connection*);
    6868    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    69    
     69    virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
     70
    7071    PluginProcessConnectionManager* m_pluginProcessConnectionManager;
    7172    String m_pluginPath;

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r84288 r84293  
    667667}
    668668
     669void WebProcess::syncMessageSendTimedOut(CoreIPC::Connection*)
     670{
     671}
     672
    669673WebFrame* WebProcess::webFrame(uint64_t frameID) const
    670674{

  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r84288 r84293  
    169169
    170170    // CoreIPC::Connection::Client
    171     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
    172     CoreIPC::SyncReplyMode didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
    173     void didClose(CoreIPC::Connection*);
    174     void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
     171    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
     172    virtual CoreIPC::SyncReplyMode didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
     173    virtual void didClose(CoreIPC::Connection*);
     174    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
     175    virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
     176
    175177#if PLATFORM(WIN)
    176178    Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
Note: See TracChangeset for help on using the changeset viewer.