Changeset 160508 in webkit


Ignore:
Timestamp:
Dec 12, 2013 3:12:38 PM (10 years ago)
Author:
andersca@apple.com
Message:

WebPageProxy should be a MessageSender
https://bugs.webkit.org/show_bug.cgi?id=125654

Reviewed by Sam Weinig.

  • Platform/CoreIPC/MessageSender.cpp:

(CoreIPC::MessageSender::sendMessage):

  • Platform/CoreIPC/MessageSender.h:

(CoreIPC::MessageSender::send):

  • Shared/ChildProcessProxy.h:
  • Shared/WebConnection.cpp:

(WebKit::WebConnection::postMessage):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::sendMessage):
(WebKit::WebPageProxy::messageSenderConnection):
(WebKit::WebPageProxy::messageSenderDestinationID):

  • UIProcess/WebPageProxy.h:
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r160504 r160508  
     12013-12-12  Anders Carlsson  <andersca@apple.com>
     2
     3        WebPageProxy should be a MessageSender
     4        https://bugs.webkit.org/show_bug.cgi?id=125654
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Platform/CoreIPC/MessageSender.cpp:
     9        (CoreIPC::MessageSender::sendMessage):
     10        * Platform/CoreIPC/MessageSender.h:
     11        (CoreIPC::MessageSender::send):
     12        * Shared/ChildProcessProxy.h:
     13        * Shared/WebConnection.cpp:
     14        (WebKit::WebConnection::postMessage):
     15        * UIProcess/WebPageProxy.cpp:
     16        (WebKit::WebPageProxy::initializeWebPage):
     17        (WebKit::WebPageProxy::sendMessage):
     18        (WebKit::WebPageProxy::messageSenderConnection):
     19        (WebKit::WebPageProxy::messageSenderDestinationID):
     20        * UIProcess/WebPageProxy.h:
     21
    1222013-12-12  Anders Carlsson  <andersca@apple.com>
    223
  • trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.cpp

    r156354 r160508  
    3333}
    3434
    35 bool MessageSender::sendMessage(std::unique_ptr<MessageEncoder> encoder)
     35bool MessageSender::sendMessage(std::unique_ptr<MessageEncoder> encoder, unsigned messageSendFlags)
    3636{
    3737    ASSERT(messageSenderConnection());
    3838
    39     return messageSenderConnection()->sendMessage(std::move(encoder));
     39    return messageSenderConnection()->sendMessage(std::move(encoder), messageSendFlags);
    4040}
    4141
  • trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h

    r160197 r160508  
    3838    template<typename U> bool send(const U& message)
    3939    {
    40         return send(message, messageSenderDestinationID());
     40        return send(message, messageSenderDestinationID(), 0);
    4141    }
    4242
    43     template<typename U> bool send(const U& message, uint64_t destinationID)
     43    template<typename U> bool send(const U& message, uint64_t destinationID, unsigned messageSendFlags = 0)
    4444    {
    4545        static_assert(!U::isSync, "Message is sync!");
     
    4848        encoder->encode(message.arguments());
    4949       
    50         return sendMessage(std::move(encoder));
     50        return sendMessage(std::move(encoder), messageSendFlags);
    5151    }
    5252
     
    6767    }
    6868
    69     bool sendMessage(std::unique_ptr<MessageEncoder>);
     69    virtual bool sendMessage(std::unique_ptr<MessageEncoder>, unsigned messageSendFlags);
    7070
    7171private:
  • trunk/Source/WebKit2/Shared/ChildProcessProxy.h

    r160464 r160508  
    6767    PlatformProcessIdentifier processIdentifier() const { return m_processLauncher->processIdentifier(); }
    6868
     69    bool sendMessage(std::unique_ptr<CoreIPC::MessageEncoder>, unsigned messageSendFlags);
     70
    6971protected:
    7072    void clearConnection();
     
    8183    virtual void connectionWillOpen(CoreIPC::Connection*);
    8284    virtual void connectionWillClose(CoreIPC::Connection*);
    83 
    84     bool sendMessage(std::unique_ptr<CoreIPC::MessageEncoder>, unsigned messageSendFlags);
    8585
    8686    Vector<std::pair<std::unique_ptr<CoreIPC::MessageEncoder>, unsigned>> m_pendingMessages;
  • trunk/Source/WebKit2/Shared/WebConnection.cpp

    r159988 r160508  
    5656    encodeMessageBody(*encoder, messageBody);
    5757
    58     sendMessage(std::move(encoder));
     58    sendMessage(std::move(encoder), 0);
    5959}
    6060
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r160495 r160508  
    526526
    527527#if ENABLE(PAGE_VISIBILITY_API)
    528     process().send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true), m_pageID);
     528    send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true));
    529529#elif ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
    530     process().send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID);
     530    send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true));
    531531#endif
    532532
    533533#if PLATFORM(MAC)
    534     process().send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID);
     534    send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled));
    535535#endif
    536536}
     
    30913091{
    30923092    m_findClient.didFailToFindString(this, string);
     3093}
     3094
     3095bool WebPageProxy::sendMessage(std::unique_ptr<CoreIPC::MessageEncoder> encoder, unsigned messageSendFlags)
     3096{
     3097    return m_process->sendMessage(std::move(encoder), messageSendFlags);
     3098}
     3099
     3100CoreIPC::Connection* WebPageProxy::messageSenderConnection()
     3101{
     3102    return m_process->connection();
     3103}
     3104
     3105uint64_t WebPageProxy::messageSenderDestinationID()
     3106{
     3107    return m_pageID;
    30933108}
    30943109
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r160495 r160508  
    3535#include "GeolocationPermissionRequestManagerProxy.h"
    3636#include "LayerTreeContext.h"
     37#include "MessageSender.h"
    3738#include "NotificationPermissionRequestManagerProxy.h"
    3839#include "PageLoadState.h"
     
    314315#endif
    315316
    316 class WebPageProxy
    317     : public API::ObjectImpl<API::Object::Type::Page>
     317class WebPageProxy : public API::ObjectImpl<API::Object::Type::Page>
    318318#if ENABLE(INPUT_TYPE_COLOR)
    319319    , public WebColorPicker::Client
    320320#endif
    321321    , public WebPopupMenuProxy::Client
    322     , public CoreIPC::MessageReceiver {
     322    , public CoreIPC::MessageReceiver
     323    , public CoreIPC::MessageSender {
    323324public:
    324325
     
    863864    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
    864865    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, std::unique_ptr<CoreIPC::MessageEncoder>&) OVERRIDE;
     866
     867    // CoreIPC::MessageSender
     868    virtual bool sendMessage(std::unique_ptr<CoreIPC::MessageEncoder>, unsigned messageSendFlags) OVERRIDE;
     869    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     870    virtual uint64_t messageSenderDestinationID() OVERRIDE;
    865871
    866872    // WebPopupMenuProxy::Client
Note: See TracChangeset for help on using the changeset viewer.