Changeset 64867 in webkit


Ignore:
Timestamp:
Aug 6, 2010 1:40:51 PM (14 years ago)
Author:
andersca@apple.com
Message:

Add CoreIPC::MessageReceiver class
​https://bugs.webkit.org/show_bug.cgi?id=43637

Reviewed by Adam Roben.

  • Platform/CoreIPC/Connection.h:

(CoreIPC::Connection::MessageReceiver::~MessageReceiver):
Add MessageReceiver class and make Client inherit from it.

(CoreIPC::Connection::MessageReceiver::didReceiveSyncMessage):
Change didReceiveSyncMessage from being a pure virtual member function and make it
assert by default instead.

  • UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
  • UIProcess/ChunkedUpdateDrawingAreaProxy.h:

Remove ChunkedUpdateDrawingAreaProxy::didReceiveSyncMessage.

  • Shared/DrawingAreaBase.h:

Include "Connection.h" instead.

  • UIProcess/DrawingAreaProxy.h:

(WebKit::DrawingAreaProxy::didReceiveSyncMessage):
Change didReceiveSyncMessage from being a pure virtual member function and make it
assert by default instead.

  • WebProcess/WebProcess.cpp:
  • WebProcess/WebProcess.h:

Remove didReceiveSyncMessage.

Location:
trunk/WebKit2
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r64862 r64867  
     12010-08-06  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        Add CoreIPC::MessageReceiver class
     6        https://bugs.webkit.org/show_bug.cgi?id=43637
     7
     8        * Platform/CoreIPC/Connection.h:
     9        (CoreIPC::Connection::MessageReceiver::~MessageReceiver):
     10        Add MessageReceiver class and make Client inherit from it.
     11
     12        (CoreIPC::Connection::MessageReceiver::didReceiveSyncMessage):
     13        Change didReceiveSyncMessage from being a pure virtual member function and make it
     14        assert by default instead.
     15
     16        * UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
     17        * UIProcess/ChunkedUpdateDrawingAreaProxy.h:
     18        Remove ChunkedUpdateDrawingAreaProxy::didReceiveSyncMessage.
     19
     20        * Shared/DrawingAreaBase.h:
     21        Include "Connection.h" instead.
     22
     23        * UIProcess/DrawingAreaProxy.h:
     24        (WebKit::DrawingAreaProxy::didReceiveSyncMessage):
     25        Change didReceiveSyncMessage from being a pure virtual member function and make it
     26        assert by default instead.
     27
     28        * WebProcess/WebProcess.cpp:
     29        * WebProcess/WebProcess.h:
     30        Remove didReceiveSyncMessage.
     31
    1322010-08-06  Jessie Berlin  <jberlin@apple.com>
    233

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

    r64223 r64867  
    5656class Connection : public ThreadSafeShared<Connection> {
    5757public:
    58     class Client {
     58    class MessageReceiver {
     59    protected:
     60        virtual ~MessageReceiver() { }
     61
    5962    public:
     63        virtual void didReceiveMessage(Connection*, MessageID, ArgumentDecoder*) = 0;
     64        virtual void didReceiveSyncMessage(Connection*, MessageID, ArgumentDecoder*, ArgumentEncoder*) { ASSERT_NOT_REACHED(); }
     65    };
     66   
     67    class Client : public MessageReceiver {
     68    protected:
    6069        virtual ~Client() { }
    61        
    62         virtual void didReceiveMessage(Connection*, MessageID, ArgumentDecoder*) = 0;
    63         virtual void didReceiveSyncMessage(Connection*, MessageID, ArgumentDecoder*, ArgumentEncoder*) = 0;
     70
     71    public:       
    6472        virtual void didClose(Connection*) = 0;
    6573    };

  • trunk/WebKit2/Shared/DrawingAreaBase.h

    r64599 r64867  
    2828
    2929#include "ArgumentCoders.h"
     30#include "Connection.h"
    3031
    3132namespace WebCore {
    3233    class IntRect;
    3334    class IntSize;
    34 }
    35 
    36 namespace CoreIPC {
    37     class ArgumentDecoder;
    38     class Connection;
    39     class MessageID;
    4035}
    4136

  • trunk/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp

    r64594 r64867  
    169169}
    170170
    171 void ChunkedUpdateDrawingAreaProxy::didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&, CoreIPC::ArgumentEncoder&)
    172 {
    173     ASSERT_NOT_REACHED();
    174 }
    175 
    176171} // namespace WebKit

  • trunk/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h

    r63843 r64867  
    7272    // DrawingAreaProxy
    7373    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&);
    74     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&, CoreIPC::ArgumentEncoder&);
    7574    virtual void paint(const WebCore::IntRect&, PlatformDrawingContext);
    7675    virtual void setSize(const WebCore::IntSize&);

  • trunk/WebKit2/UIProcess/DrawingAreaProxy.h

    r64594 r64867  
    5050
    5151    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&) = 0;
    52     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&, CoreIPC::ArgumentEncoder&) = 0;
     52    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder&, CoreIPC::ArgumentEncoder&) { ASSERT_NOT_REACHED(); }
    5353
    5454    virtual void paint(const WebCore::IntRect&, PlatformDrawingContext) = 0;

  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r64862 r64867  
    820820                                BC111B5A112F628200337BAB /* mac */,
    821821                                BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
     822                                0FB659A51208B9EE0044816C /* DrawingAreaBase.cpp */,
    822823                                0FB659221208B4DB0044816C /* DrawingAreaBase.h */,
    823                                 0FB659A51208B9EE0044816C /* DrawingAreaBase.cpp */,
    824824                                1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */,
    825825                                BC64696D11DBE603006455B0 /* ImmutableArray.cpp */,

  • trunk/WebKit2/WebProcess/WebProcess.cpp

    r64797 r64867  
    310310}
    311311
    312 void WebProcess::didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*)
    313 {
    314     // The web process should never ever get sync messages.
    315     ASSERT_NOT_REACHED();
    316 }
    317 
    318312void WebProcess::didClose(CoreIPC::Connection*)
    319313{

  • trunk/WebKit2/WebProcess/WebProcess.h

    r64861 r64867  
    8787    // CoreIPC::Connection::Client
    8888    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
    89     void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
    9089    void didClose(CoreIPC::Connection*);
    9190
Note: See TracChangeset for help on using the changeset viewer.