Changeset 150669 in webkit


Ignore:
Timestamp:
May 24, 2013 5:17:20 PM (11 years ago)
Author:
andersca@apple.com
Message:

MessageSender shouldn't be a class template
https://bugs.webkit.org/show_bug.cgi?id=116743

Reviewed by Andreas Kling.

Change MessageSender to be a proper abstract base class. Subclasses of MessageSender must
implement messageSenderConnection() as well as messageSenderDestinationID().

This reduces code size and will allow us to be more flexible with MessageSender in the future.

  • NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::sendAbortingOnFailure):
(WebKit::NetworkResourceLoader::messageSenderConnection):
(WebKit):
(WebKit::NetworkResourceLoader::messageSenderDestinationID):

  • NetworkProcess/NetworkResourceLoader.h:

(NetworkResourceLoader):

  • NetworkProcess/mac/DiskCacheMonitor.h:

(DiskCacheMonitor):

  • NetworkProcess/mac/DiskCacheMonitor.mm:

(WebKit::DiskCacheMonitor::messageSenderConnection):
(WebKit::DiskCacheMonitor::messageSenderDestinationID):
(WebKit):

  • Platform/CoreIPC/MessageSender.h:

(CoreIPC):
(MessageSender):
(CoreIPC::MessageSender::send):
(CoreIPC::MessageSender::sendSync):

  • Shared/ChildProcess.cpp:

(WebKit::ChildProcess::messageSenderConnection):
(WebKit):
(WebKit::ChildProcess::messageSenderDestinationID):

  • Shared/ChildProcess.h:

(ChildProcess):

  • Shared/Downloads/Download.cpp:

(WebKit::Download::messageSenderConnection):
(WebKit):
(WebKit::Download::messageSenderDestinationID):

  • Shared/Downloads/Download.h:

(Download):

  • Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:

(WebKit::CustomProtocolManager::initialize):

  • Shared/WebConnection.h:

(WebConnection):

  • Shared/mac/SecItemShim.cpp:

(WebKit::sendSecItemRequest):

  • UIProcess/WebConnectionToWebProcess.cpp:

(WebKit::WebConnectionToWebProcess::hasValidConnection):
(WebKit::WebConnectionToWebProcess::messageSenderConnection):
(WebKit::WebConnectionToWebProcess::messageSenderDestinationID):

  • UIProcess/WebConnectionToWebProcess.h:

(WebConnectionToWebProcess):

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/Geolocation/WebGeolocationManager.cpp:

(WebKit::WebGeolocationManager::registerWebPage):
(WebKit::WebGeolocationManager::unregisterWebPage):

  • WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:

(WebKit::WebIconDatabaseProxy::retainIconForPageURL):
(WebKit::WebIconDatabaseProxy::releaseIconForPageURL):
(WebKit::WebIconDatabaseProxy::synchronousIconForPageURL):
(WebKit::WebIconDatabaseProxy::loadDecisionForIconURL):
(WebKit::WebIconDatabaseProxy::setIconURLForPageURL):
(WebKit::WebIconDatabaseProxy::setIconDataForIconURL):

  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::postMessage):
(WebKit::InjectedBundle::postSynchronousMessage):

  • WebProcess/Network/WebResourceLoader.cpp:

(WebKit::WebResourceLoader::messageSenderConnection):
(WebKit::WebResourceLoader::messageSenderDestinationID):

  • WebProcess/Network/WebResourceLoader.h:

(WebResourceLoader):

  • WebProcess/Notifications/WebNotificationManager.cpp:

(WebKit::WebNotificationManager::show):
(WebKit::WebNotificationManager::cancel):
(WebKit::WebNotificationManager::clearNotifications):
(WebKit::WebNotificationManager::didDestroyNotification):

  • WebProcess/Plugins/PDF/PDFPlugin.mm:

(WebKit::PDFPlugin::writeItemsToPasteboard):

  • WebProcess/Plugins/PluginProcessConnectionManager.cpp:

(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):

  • WebProcess/Storage/StorageAreaMap.cpp:

(WebKit::StorageAreaMap::StorageAreaMap):
(WebKit::StorageAreaMap::~StorageAreaMap):
(WebKit::StorageAreaMap::setItem):
(WebKit::StorageAreaMap::removeItem):
(WebKit::StorageAreaMap::clear):
(WebKit::StorageAreaMap::loadValuesIfNeeded):

  • WebProcess/WebConnectionToUIProcess.cpp:

(WebKit::WebConnectionToUIProcess::hasValidConnection):
(WebKit::WebConnectionToUIProcess::messageSenderConnection):
(WebKit::WebConnectionToUIProcess::messageSenderDestinationID):

  • WebProcess/WebConnectionToUIProcess.h:

(WebConnectionToUIProcess):

  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::windowRect):
(WebKit::WebChromeClient::focusedFrameChanged):
(WebKit::WebChromeClient::createWindow):
(WebKit::WebChromeClient::toolbarsVisible):
(WebKit::WebChromeClient::statusbarVisible):
(WebKit::WebChromeClient::menubarVisible):
(WebKit::WebChromeClient::runBeforeUnloadConfirmPanel):
(WebKit::WebChromeClient::runJavaScriptAlert):
(WebKit::WebChromeClient::runJavaScriptConfirm):
(WebKit::WebChromeClient::runJavaScriptPrompt):
(WebKit::WebChromeClient::shouldInterruptJavaScript):
(WebKit::WebChromeClient::exceededDatabaseQuota):

  • WebProcess/WebCoreSupport/WebColorChooser.cpp:

(WebKit::WebColorChooser::WebColorChooser):
(WebKit::WebColorChooser::setSelectedColor):
(WebKit::WebColorChooser::endChooser):

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDidReceiveIcon):
(WebKit::WebFrameLoaderClient::updateGlobalHistory):
(WebKit::WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):
(WebKit::WebFrameLoaderClient::setTitle):

  • WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:

(WebKit::WebPlatformStrategies::populatePluginCache):
(WebKit::WebPlatformStrategies::getTypes):
(WebKit::WebPlatformStrategies::bufferForType):
(WebKit::WebPlatformStrategies::getPathnamesForType):
(WebKit::WebPlatformStrategies::stringForType):
(WebKit::WebPlatformStrategies::copy):
(WebKit::WebPlatformStrategies::changeCount):
(WebKit::WebPlatformStrategies::uniqueName):
(WebKit::WebPlatformStrategies::color):
(WebKit::WebPlatformStrategies::url):
(WebKit::WebPlatformStrategies::addTypes):
(WebKit::WebPlatformStrategies::setTypes):
(WebKit::WebPlatformStrategies::setBufferForType):
(WebKit::WebPlatformStrategies::setPathnamesForType):
(WebKit::WebPlatformStrategies::setStringForType):

  • WebProcess/WebCoreSupport/WebPopupMenu.cpp:

(WebKit::WebPopupMenu::show):
(WebKit::WebPopupMenu::hide):

  • WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp:

(WebKit::WebSearchPopupMenu::saveRecentSearches):
(WebKit::WebSearchPopupMenu::loadRecentSearches):

  • WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::sendDidReceiveEvent):

  • WebProcess/WebPage/WebBackForwardListProxy.cpp:

(WebKit::updateBackForwardItem):
(WebKit::WebBackForwardListProxy::itemAtIndex):
(WebKit::WebBackForwardListProxy::backListCount):
(WebKit::WebBackForwardListProxy::forwardListCount):

  • WebProcess/WebPage/WebInspector.cpp:

(WebKit::WebInspector::createInspectorPage):
(WebKit::WebInspector::didClose):
(WebKit::WebInspector::bringToFront):
(WebKit::WebInspector::inspectedURLChanged):
(WebKit::WebInspector::save):
(WebKit::WebInspector::append):
(WebKit::WebInspector::attachBottom):
(WebKit::WebInspector::attachRight):
(WebKit::WebInspector::detach):
(WebKit::WebInspector::setAttachedWindowHeight):
(WebKit::WebInspector::setAttachedWindowWidth):
(WebKit::WebInspector::setToolbarHeight):
(WebKit::WebInspector::updateDockingAvailability):
(WebKit::WebInspector::sendMessageToRemoteFrontend):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::messageSenderConnection):
(WebKit):
(WebKit::WebPage::messageSenderDestinationID):

  • WebProcess/WebPage/WebPage.h:

(WebPage):

  • WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::executeKeypressCommandsInternal):
(WebKit::WebPage::handleEditingKeyboardEvent):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::ensureNetworkProcessConnection):
(WebKit::WebProcess::shouldTerminate):

Location:
trunk/Source/WebKit2
Files:
40 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r150666 r150669  
     12013-05-24  Anders Carlsson  <andersca@apple.com>
     2
     3        MessageSender shouldn't be a class template
     4        https://bugs.webkit.org/show_bug.cgi?id=116743
     5
     6        Reviewed by Andreas Kling.
     7
     8        Change MessageSender to be a proper abstract base class. Subclasses of MessageSender must
     9        implement messageSenderConnection() as well as messageSenderDestinationID().
     10
     11        This reduces code size and will allow us to be more flexible with MessageSender in the future.
     12
     13        * NetworkProcess/NetworkResourceLoader.cpp:
     14        (WebKit::NetworkResourceLoader::sendAbortingOnFailure):
     15        (WebKit::NetworkResourceLoader::messageSenderConnection):
     16        (WebKit):
     17        (WebKit::NetworkResourceLoader::messageSenderDestinationID):
     18        * NetworkProcess/NetworkResourceLoader.h:
     19        (NetworkResourceLoader):
     20        * NetworkProcess/mac/DiskCacheMonitor.h:
     21        (DiskCacheMonitor):
     22        * NetworkProcess/mac/DiskCacheMonitor.mm:
     23        (WebKit::DiskCacheMonitor::messageSenderConnection):
     24        (WebKit::DiskCacheMonitor::messageSenderDestinationID):
     25        (WebKit):
     26        * Platform/CoreIPC/MessageSender.h:
     27        (CoreIPC):
     28        (MessageSender):
     29        (CoreIPC::MessageSender::send):
     30        (CoreIPC::MessageSender::sendSync):
     31        * Shared/ChildProcess.cpp:
     32        (WebKit::ChildProcess::messageSenderConnection):
     33        (WebKit):
     34        (WebKit::ChildProcess::messageSenderDestinationID):
     35        * Shared/ChildProcess.h:
     36        (ChildProcess):
     37        * Shared/Downloads/Download.cpp:
     38        (WebKit::Download::messageSenderConnection):
     39        (WebKit):
     40        (WebKit::Download::messageSenderDestinationID):
     41        * Shared/Downloads/Download.h:
     42        (Download):
     43        * Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:
     44        (WebKit::CustomProtocolManager::initialize):
     45        * Shared/WebConnection.h:
     46        (WebConnection):
     47        * Shared/mac/SecItemShim.cpp:
     48        (WebKit::sendSecItemRequest):
     49        * UIProcess/WebConnectionToWebProcess.cpp:
     50        (WebKit::WebConnectionToWebProcess::hasValidConnection):
     51        (WebKit::WebConnectionToWebProcess::messageSenderConnection):
     52        (WebKit::WebConnectionToWebProcess::messageSenderDestinationID):
     53        * UIProcess/WebConnectionToWebProcess.h:
     54        (WebConnectionToWebProcess):
     55        * WebKit2.xcodeproj/project.pbxproj:
     56        * WebProcess/Geolocation/WebGeolocationManager.cpp:
     57        (WebKit::WebGeolocationManager::registerWebPage):
     58        (WebKit::WebGeolocationManager::unregisterWebPage):
     59        * WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:
     60        (WebKit::WebIconDatabaseProxy::retainIconForPageURL):
     61        (WebKit::WebIconDatabaseProxy::releaseIconForPageURL):
     62        (WebKit::WebIconDatabaseProxy::synchronousIconForPageURL):
     63        (WebKit::WebIconDatabaseProxy::loadDecisionForIconURL):
     64        (WebKit::WebIconDatabaseProxy::setIconURLForPageURL):
     65        (WebKit::WebIconDatabaseProxy::setIconDataForIconURL):
     66        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     67        (WebKit::InjectedBundle::postMessage):
     68        (WebKit::InjectedBundle::postSynchronousMessage):
     69        * WebProcess/Network/WebResourceLoader.cpp:
     70        (WebKit::WebResourceLoader::messageSenderConnection):
     71        (WebKit::WebResourceLoader::messageSenderDestinationID):
     72        * WebProcess/Network/WebResourceLoader.h:
     73        (WebResourceLoader):
     74        * WebProcess/Notifications/WebNotificationManager.cpp:
     75        (WebKit::WebNotificationManager::show):
     76        (WebKit::WebNotificationManager::cancel):
     77        (WebKit::WebNotificationManager::clearNotifications):
     78        (WebKit::WebNotificationManager::didDestroyNotification):
     79        * WebProcess/Plugins/PDF/PDFPlugin.mm:
     80        (WebKit::PDFPlugin::writeItemsToPasteboard):
     81        * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
     82        (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
     83        * WebProcess/Storage/StorageAreaMap.cpp:
     84        (WebKit::StorageAreaMap::StorageAreaMap):
     85        (WebKit::StorageAreaMap::~StorageAreaMap):
     86        (WebKit::StorageAreaMap::setItem):
     87        (WebKit::StorageAreaMap::removeItem):
     88        (WebKit::StorageAreaMap::clear):
     89        (WebKit::StorageAreaMap::loadValuesIfNeeded):
     90        * WebProcess/WebConnectionToUIProcess.cpp:
     91        (WebKit::WebConnectionToUIProcess::hasValidConnection):
     92        (WebKit::WebConnectionToUIProcess::messageSenderConnection):
     93        (WebKit::WebConnectionToUIProcess::messageSenderDestinationID):
     94        * WebProcess/WebConnectionToUIProcess.h:
     95        (WebConnectionToUIProcess):
     96        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     97        (WebKit::WebChromeClient::windowRect):
     98        (WebKit::WebChromeClient::focusedFrameChanged):
     99        (WebKit::WebChromeClient::createWindow):
     100        (WebKit::WebChromeClient::toolbarsVisible):
     101        (WebKit::WebChromeClient::statusbarVisible):
     102        (WebKit::WebChromeClient::menubarVisible):
     103        (WebKit::WebChromeClient::runBeforeUnloadConfirmPanel):
     104        (WebKit::WebChromeClient::runJavaScriptAlert):
     105        (WebKit::WebChromeClient::runJavaScriptConfirm):
     106        (WebKit::WebChromeClient::runJavaScriptPrompt):
     107        (WebKit::WebChromeClient::shouldInterruptJavaScript):
     108        (WebKit::WebChromeClient::exceededDatabaseQuota):
     109        * WebProcess/WebCoreSupport/WebColorChooser.cpp:
     110        (WebKit::WebColorChooser::WebColorChooser):
     111        (WebKit::WebColorChooser::setSelectedColor):
     112        (WebKit::WebColorChooser::endChooser):
     113        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     114        (WebKit::WebFrameLoaderClient::dispatchDidReceiveIcon):
     115        (WebKit::WebFrameLoaderClient::updateGlobalHistory):
     116        (WebKit::WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):
     117        (WebKit::WebFrameLoaderClient::setTitle):
     118        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
     119        (WebKit::WebPlatformStrategies::populatePluginCache):
     120        (WebKit::WebPlatformStrategies::getTypes):
     121        (WebKit::WebPlatformStrategies::bufferForType):
     122        (WebKit::WebPlatformStrategies::getPathnamesForType):
     123        (WebKit::WebPlatformStrategies::stringForType):
     124        (WebKit::WebPlatformStrategies::copy):
     125        (WebKit::WebPlatformStrategies::changeCount):
     126        (WebKit::WebPlatformStrategies::uniqueName):
     127        (WebKit::WebPlatformStrategies::color):
     128        (WebKit::WebPlatformStrategies::url):
     129        (WebKit::WebPlatformStrategies::addTypes):
     130        (WebKit::WebPlatformStrategies::setTypes):
     131        (WebKit::WebPlatformStrategies::setBufferForType):
     132        (WebKit::WebPlatformStrategies::setPathnamesForType):
     133        (WebKit::WebPlatformStrategies::setStringForType):
     134        * WebProcess/WebCoreSupport/WebPopupMenu.cpp:
     135        (WebKit::WebPopupMenu::show):
     136        (WebKit::WebPopupMenu::hide):
     137        * WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp:
     138        (WebKit::WebSearchPopupMenu::saveRecentSearches):
     139        (WebKit::WebSearchPopupMenu::loadRecentSearches):
     140        * WebProcess/WebPage/EventDispatcher.cpp:
     141        (WebKit::EventDispatcher::sendDidReceiveEvent):
     142        * WebProcess/WebPage/WebBackForwardListProxy.cpp:
     143        (WebKit::updateBackForwardItem):
     144        (WebKit::WebBackForwardListProxy::itemAtIndex):
     145        (WebKit::WebBackForwardListProxy::backListCount):
     146        (WebKit::WebBackForwardListProxy::forwardListCount):
     147        * WebProcess/WebPage/WebInspector.cpp:
     148        (WebKit::WebInspector::createInspectorPage):
     149        (WebKit::WebInspector::didClose):
     150        (WebKit::WebInspector::bringToFront):
     151        (WebKit::WebInspector::inspectedURLChanged):
     152        (WebKit::WebInspector::save):
     153        (WebKit::WebInspector::append):
     154        (WebKit::WebInspector::attachBottom):
     155        (WebKit::WebInspector::attachRight):
     156        (WebKit::WebInspector::detach):
     157        (WebKit::WebInspector::setAttachedWindowHeight):
     158        (WebKit::WebInspector::setAttachedWindowWidth):
     159        (WebKit::WebInspector::setToolbarHeight):
     160        (WebKit::WebInspector::updateDockingAvailability):
     161        (WebKit::WebInspector::sendMessageToRemoteFrontend):
     162        * WebProcess/WebPage/WebPage.cpp:
     163        (WebKit::WebPage::messageSenderConnection):
     164        (WebKit):
     165        (WebKit::WebPage::messageSenderDestinationID):
     166        * WebProcess/WebPage/WebPage.h:
     167        (WebPage):
     168        * WebProcess/WebPage/mac/WebPageMac.mm:
     169        (WebKit::WebPage::executeKeypressCommandsInternal):
     170        (WebKit::WebPage::handleEditingKeyboardEvent):
     171        * WebProcess/WebProcess.cpp:
     172        (WebKit::WebProcess::ensureNetworkProcessConnection):
     173        (WebKit::WebProcess::shouldTerminate):
     174
    11752013-05-24  Tim Horton  <timothy_horton@apple.com>
    2176
  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

    r149499 r150669  
    6666}
    6767
    68 CoreIPC::Connection* NetworkResourceLoader::connection() const
    69 {
    70     return connectionToWebProcess()->connection();
    71 }
    72 
    73 uint64_t NetworkResourceLoader::destinationID() const
    74 {
    75     return identifier();
    76 }
    77 
    7868void NetworkResourceLoader::start()
    7969{
     
    112102template<typename U> bool NetworkResourceLoader::sendAbortingOnFailure(const U& message, unsigned messageSendFlags)
    113103{
    114     bool result = connection()->send(message, destinationID(), messageSendFlags);
     104    bool result = messageSenderConnection()->send(message, messageSenderDestinationID(), messageSendFlags);
    115105    if (!result)
    116106        abort();
     
    305295}
    306296
     297CoreIPC::Connection* NetworkResourceLoader::messageSenderConnection()
     298{
     299    return connectionToWebProcess()->connection();
     300}
     301
     302uint64_t NetworkResourceLoader::messageSenderDestinationID()
     303{
     304    return identifier();
     305}
     306
    307307#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    308308void NetworkResourceLoader::canAuthenticateAgainstProtectionSpaceAsync(ResourceHandle* handle, const ProtectionSpace& protectionSpace)
  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

    r149499 r150669  
    4848class RemoteNetworkingContext;
    4949
    50 class NetworkResourceLoader : public SchedulableLoader, public WebCore::ResourceHandleClient, public CoreIPC::MessageSender<NetworkResourceLoader> {
     50class NetworkResourceLoader : public SchedulableLoader, public WebCore::ResourceHandleClient, public CoreIPC::MessageSender {
    5151public:
    5252    static RefPtr<NetworkResourceLoader> create(const NetworkResourceLoadParameters& parameters, NetworkConnectionToWebProcess* connection)
     
    5656   
    5757    ~NetworkResourceLoader();
    58 
    59     // Used by MessageSender.
    60     CoreIPC::Connection* connection() const;
    61     uint64_t destinationID() const;
    6258
    6359    WebCore::ResourceHandle* handle() const { return m_handle.get(); }
     
    108104    NetworkResourceLoader(const NetworkResourceLoadParameters&, NetworkConnectionToWebProcess*);
    109105
     106    // CoreIPC::MessageSender
     107    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     108    virtual uint64_t messageSenderDestinationID() OVERRIDE;
     109
    110110    void continueWillSendRequest(const WebCore::ResourceRequest& newRequest);
    111111    void continueDidReceiveResponse();
  • trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h

    r147006 r150669  
    3838class NetworkResourceLoader;
    3939
    40 class DiskCacheMonitor : public CoreIPC::MessageSender<DiskCacheMonitor> {
     40class DiskCacheMonitor : public CoreIPC::MessageSender {
    4141public:
    4242    static void monitorFileBackingStoreCreation(CFCachedURLResponseRef, NetworkResourceLoader*);
    4343
    44     // Used by MessageSender.
    45     CoreIPC::Connection* connection() const;
    46     uint64_t destinationID() const { return 0; }
    47    
    4844    const WebCore::ResourceRequest& resourceRequest() const { return m_resourceRequest; }
    4945
    5046private:
    5147    DiskCacheMonitor(CFCachedURLResponseRef, NetworkResourceLoader*);
    52    
     48
     49    // CoreIPC::MessageSender
     50    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     51    virtual uint64_t messageSenderDestinationID() OVERRIDE;
     52
    5353    RefPtr<NetworkConnectionToWebProcess> m_connectionToWebProcess;
    5454    WebCore::ResourceRequest m_resourceRequest;
  • trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm

    r149678 r150669  
    9595}
    9696
    97 CoreIPC::Connection* DiskCacheMonitor::connection() const
     97CoreIPC::Connection* DiskCacheMonitor::messageSenderConnection()
    9898{
    9999    return m_connectionToWebProcess->connection();
     100}
     101
     102uint64_t DiskCacheMonitor::messageSenderDestinationID()
     103{
     104    return 0;
    100105}
    101106
  • trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.cpp

    r150668 r150669  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2424 */
    2525
    26 #ifndef WebConnectionToUIProcess_h
    27 #define WebConnectionToUIProcess_h
     26#include "config.h"
     27#include "MessageSender.h"
    2828
    29 #include "WebConnection.h"
     29namespace CoreIPC {
    3030
    31 namespace WebKit {
     31MessageSender::~MessageSender()
     32{
     33}
    3234
    33 class WebProcess;
     35bool MessageSender::sendMessage(PassOwnPtr<MessageEncoder> encoder)
     36{
     37    ASSERT(messageSenderConnection());
    3438
    35 class WebConnectionToUIProcess : public WebConnection {
    36 public:
    37     static PassRefPtr<WebConnectionToUIProcess> create(WebProcess*);
     39    return messageSenderConnection()->sendMessage(encoder);
     40}
    3841
    39     void invalidate();
    40 
    41 private:
    42     WebConnectionToUIProcess(WebProcess*);
    43 
    44     // WebConnection
    45     virtual void encodeMessageBody(CoreIPC::ArgumentEncoder&, APIObject*) OVERRIDE;
    46     virtual bool decodeMessageBody(CoreIPC::ArgumentDecoder&, RefPtr<APIObject>&) OVERRIDE;
    47     virtual CoreIPC::Connection* connection() const OVERRIDE;
    48     virtual uint64_t destinationID() const OVERRIDE;
    49     virtual bool hasValidConnection() const OVERRIDE;
    50 
    51     WebProcess* m_process;
    52 };
    53 
    54 } // namespace WebKit
    55 
    56 #endif // WebConnectionToUIProcess_h
     42} // namespace CoreIPC
  • trunk/Source/WebKit2/Platform/CoreIPC/MessageSender.h

    r141191 r150669  
    3131
    3232namespace CoreIPC {
    33    
    34 template<typename T> class MessageSender {
     33
     34class MessageSender {
    3535public:
     36    virtual ~MessageSender();
     37
    3638    template<typename U> bool send(const U& message)
    3739    {
    38         return send(message, static_cast<T*>(this)->destinationID());
     40        return send(message, messageSenderDestinationID());
    3941    }
    4042
     
    4547        encoder->encode(message);
    4648       
    47         return static_cast<T*>(this)->sendMessage(encoder.release());
    48     }
    49    
    50     bool sendMessage(PassOwnPtr<MessageEncoder> encoder)
    51     {
    52         Connection* connection = static_cast<T*>(this)->connection();
    53         ASSERT(connection);
    54 
    55         return connection->sendMessage(encoder);
     49        return sendMessage(encoder.release());
    5650    }
    5751
     
    5953    {
    6054        COMPILE_ASSERT(U::isSync, SyncMessageExpected);
    61         return sendSync(message, reply, static_cast<T*>(this)->destinationID(), timeout);
     55        return sendSync(message, reply, messageSenderDestinationID(), timeout);
    6256    }
    63    
     57
    6458    template<typename U> bool sendSync(const U& message, const typename U::Reply& reply, uint64_t destinationID, double timeout = Connection::NoTimeout)
    6559    {
    66         Connection* connection = static_cast<T*>(this)->connection();
    67         ASSERT(connection);
     60        ASSERT(messageSenderConnection());
    6861
    69         return connection->sendSync(message, reply, destinationID, timeout);
     62        return messageSenderConnection()->sendSync(message, reply, destinationID, timeout);
    7063    }
     64
     65    bool sendMessage(PassOwnPtr<MessageEncoder>);
     66
     67private:
     68    virtual Connection* messageSenderConnection() = 0;
     69    virtual uint64_t messageSenderDestinationID() = 0;
    7170};
    7271
  • trunk/Source/WebKit2/Shared/ChildProcess.cpp

    r141796 r150669  
    130130}
    131131
     132CoreIPC::Connection* ChildProcess::messageSenderConnection()
     133{
     134    return m_connection.get();
     135}
     136
     137uint64_t ChildProcess::messageSenderDestinationID()
     138{
     139    return 0;
     140}
     141
    132142void ChildProcess::terminationTimerFired()
    133143{
  • trunk/Source/WebKit2/Shared/ChildProcess.h

    r149413 r150669  
    4747};
    4848
    49 class ChildProcess : protected CoreIPC::Connection::Client, public CoreIPC::MessageSender<ChildProcess> {
     49class ChildProcess : protected CoreIPC::Connection::Client, public CoreIPC::MessageSender {
    5050    WTF_MAKE_NONCOPYABLE(ChildProcess);
    5151
     
    7171    CoreIPC::Connection* parentProcessConnection() const { return m_connection.get(); }
    7272
    73     // Used by CoreIPC::MessageSender
    74     CoreIPC::Connection* connection() const { return m_connection.get(); }
    75     uint64_t destinationID() const { return 0; }
    76 
    7773    CoreIPC::MessageReceiverMap& messageReceiverMap() { return m_messageReceiverMap; }
    7874
     
    9288
    9389private:
     90    // CoreIPC::MessageSender
     91    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     92    virtual uint64_t messageSenderDestinationID() OVERRIDE;
     93
    9494    void terminationTimerFired();
    9595
  • trunk/Source/WebKit2/Shared/Downloads/Download.cpp

    r145369 r150669  
    6666
    6767    m_downloadManager.didDestroyDownload();
    68 }
    69 
    70 CoreIPC::Connection* Download::connection() const
    71 {
    72     return m_downloadManager.downloadProxyConnection();
    7368}
    7469
     
    166161}
    167162
     163CoreIPC::Connection* Download::messageSenderConnection()
     164{
     165    return m_downloadManager.downloadProxyConnection();
     166}
     167
     168uint64_t Download::messageSenderDestinationID()
     169{
     170    return m_downloadID;
     171}
     172
    168173} // namespace WebKit
  • trunk/Source/WebKit2/Shared/Downloads/Download.h

    r140752 r150669  
    7171#endif
    7272
    73 class Download : public CoreIPC::MessageSender<Download> {
     73class Download : public CoreIPC::MessageSender {
    7474    WTF_MAKE_NONCOPYABLE(Download);
    7575public:
    7676    static PassOwnPtr<Download> create(DownloadManager&, uint64_t downloadID, const WebCore::ResourceRequest&);
    7777    ~Download();
    78 
    79     // Used by MessageSender.
    80     CoreIPC::Connection* connection() const;
    81     uint64_t destinationID() const { return downloadID(); }
    8278
    8379    void start();
     
    121117    Download(DownloadManager&, uint64_t downloadID, const WebCore::ResourceRequest&);
    122118
     119    // CoreIPC::MessageSender
     120    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     121    virtual uint64_t messageSenderDestinationID() OVERRIDE;
     122
    123123    void platformInvalidate();
    124124
  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm

    r149774 r150669  
    143143    ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty() || !parameters.usesNetworkProcess);
    144144    if (parameters.usesNetworkProcess) {
    145         m_childProcess->connection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
     145        m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
    146146        m_messageQueue = nullptr;
    147147        return;
  • trunk/Source/WebKit2/Shared/WebConnection.h

    r147403 r150669  
    3535namespace WebKit {
    3636
    37 class WebConnection : public TypedAPIObject<APIObject::TypeConnection>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender<WebConnection> {
     37class WebConnection : public TypedAPIObject<APIObject::TypeConnection>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
    3838public:
    3939    virtual ~WebConnection();
     
    4242    void postMessage(const String&, APIObject*);
    4343    void didClose();
    44 
    45     // Used by CoreIPC::MessageSender
    46     virtual CoreIPC::Connection* connection() const = 0;
    47     virtual uint64_t destinationID() const = 0;
    4844
    4945protected:
  • trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp

    r142696 r150669  
    7474{
    7575    uint64_t requestID = generateSecItemRequestID();
    76     if (!sharedProcess->connection()->send(Messages::SecItemShimProxy::SecItemRequest(requestID, SecItemRequestData(requestType, query, attributesToMatch)), 0))
     76    if (!sharedProcess->parentProcessConnection()->send(Messages::SecItemShimProxy::SecItemRequest(requestID, SecItemRequestData(requestType, query, attributesToMatch)), 0))
    7777        return nullptr;
    7878
  • trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp

    r135347 r150669  
    6262}
    6363
    64 CoreIPC::Connection* WebConnectionToWebProcess::connection() const
    65 {
    66     return m_process->connection();
    67 }
    68 
    69 uint64_t WebConnectionToWebProcess::destinationID() const
    70 {
    71     return 0;
    72 }
    73 
    7464bool WebConnectionToWebProcess::hasValidConnection() const
    7565{
     
    7767}
    7868
     69CoreIPC::Connection* WebConnectionToWebProcess::messageSenderConnection()
     70{
     71    return m_process->connection();
     72}
     73
     74uint64_t WebConnectionToWebProcess::messageSenderDestinationID()
     75{
     76    return 0;
     77}
     78
    7979} // namespace WebKit
  • trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h

    r135347 r150669  
    4747    virtual void encodeMessageBody(CoreIPC::ArgumentEncoder&, APIObject*) OVERRIDE;
    4848    virtual bool decodeMessageBody(CoreIPC::ArgumentDecoder&, RefPtr<APIObject>&) OVERRIDE;
    49     virtual CoreIPC::Connection* connection() const OVERRIDE;
    50     virtual uint64_t destinationID() const OVERRIDE;
    5149    virtual bool hasValidConnection() const OVERRIDE;
     50
     51    // CoreIPC::MessageSender
     52    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     53    virtual uint64_t messageSenderDestinationID() OVERRIDE;
    5254
    5355    WebProcessProxy* m_process;
  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r150484 r150669  
    173173                1A64256912DE42EC00CAAE2C /* BackingStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64256712DE42EC00CAAE2C /* BackingStore.cpp */; };
    174174                1A64292D12DE5F9800CAAE2C /* BackingStoreMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A64292C12DE5F9800CAAE2C /* BackingStoreMac.mm */; };
     175                1A6506D2175015E700174518 /* MessageSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6506D1175015E700174518 /* MessageSender.cpp */; };
    175176                1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
    176177                1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */; };
     
    16011602                1A64256712DE42EC00CAAE2C /* BackingStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackingStore.cpp; sourceTree = "<group>"; };
    16021603                1A64292C12DE5F9800CAAE2C /* BackingStoreMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BackingStoreMac.mm; sourceTree = "<group>"; };
     1604                1A6506D1175015E700174518 /* MessageSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MessageSender.cpp; sourceTree = "<group>"; };
    16031605                1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
    16041606                1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineMac.cpp; sourceTree = "<group>"; };
     
    34563458                                1A3EED0C161A535300AEB4F5 /* MessageReceiverMap.cpp */,
    34573459                                1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */,
     3460                                1A6506D1175015E700174518 /* MessageSender.cpp */,
    34583461                                1A119A94127B796200A9ECB1 /* MessageSender.h */,
    34593462                                1A13BEB11635A9C800F19C03 /* StringReference.cpp */,
     
    67536756                                E1EDFDA9162886AC0039ECDA /* SharedWorkerProcess.cpp in Sources */,
    67546757                                E1EDFDB0162889820039ECDA /* SharedWorkerProcessCreationParameters.cpp in Sources */,
     6758                                1A6506D2175015E700174518 /* MessageSender.cpp in Sources */,
    67556759                                E1EDFDA8162886990039ECDA /* SharedWorkerProcessMac.mm in Sources */,
    67566760                                BC82839516B4608300A278FE /* SharedWorkerProcessMain.mm in Sources */,
  • trunk/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp

    r149848 r150669  
    6363   
    6464    if (wasEmpty)
    65         m_process->connection()->send(Messages::WebGeolocationManagerProxy::StartUpdating(), 0);
     65        m_process->parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::StartUpdating(), 0);
    6666}
    6767
     
    7171
    7272    if (m_pageSet.isEmpty())
    73         m_process->connection()->send(Messages::WebGeolocationManagerProxy::StopUpdating(), 0);
     73        m_process->parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::StopUpdating(), 0);
    7474}
    7575
  • trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp

    r148233 r150669  
    6565void WebIconDatabaseProxy::retainIconForPageURL(const String& pageURL)
    6666{
    67     m_process->connection()->send(Messages::WebIconDatabase::RetainIconForPageURL(pageURL), 0);
     67    m_process->parentProcessConnection()->send(Messages::WebIconDatabase::RetainIconForPageURL(pageURL), 0);
    6868}
    6969
    7070void WebIconDatabaseProxy::releaseIconForPageURL(const String& pageURL)
    7171{
    72     m_process->connection()->send(Messages::WebIconDatabase::ReleaseIconForPageURL(pageURL), 0);
     72    m_process->parentProcessConnection()->send(Messages::WebIconDatabase::ReleaseIconForPageURL(pageURL), 0);
    7373}
    7474
     
    7676{
    7777    CoreIPC::DataReference result;
    78     if (!m_process->connection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0))
     78    if (!m_process->parentProcessConnection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0))
    7979        return 0;
    8080   
     
    115115    m_iconLoadDecisionCallbacks.add(id, callback);
    116116   
    117     m_process->connection()->send(Messages::WebIconDatabase::GetLoadDecisionForIconURL(iconURL, id), 0);
     117    m_process->parentProcessConnection()->send(Messages::WebIconDatabase::GetLoadDecisionForIconURL(iconURL, id), 0);
    118118}
    119119
     
    131131void WebIconDatabaseProxy::setIconURLForPageURL(const String& iconURL, const String& pageURL)
    132132{
    133     m_process->connection()->send(Messages::WebIconDatabase::SetIconURLForPageURL(iconURL, pageURL), 0);
     133    m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconURLForPageURL(iconURL, pageURL), 0);
    134134}
    135135
     
    137137{
    138138    CoreIPC::DataReference data(reinterpret_cast<const uint8_t*>(iconData ? iconData->data() : 0), iconData ? iconData->size() : 0);
    139     m_process->connection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0);
     139    m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0);
    140140}
    141141
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r150663 r150669  
    113113    encoder->encode(InjectedBundleUserMessageEncoder(messageBody));
    114114
    115     WebProcess::shared().connection()->sendMessage(encoder.release());
     115    WebProcess::shared().parentProcessConnection()->sendMessage(encoder.release());
    116116}
    117117
     
    121121
    122122    uint64_t syncRequestID;
    123     OwnPtr<CoreIPC::MessageEncoder> encoder = WebProcess::shared().connection()->createSyncMessageEncoder(WebContextLegacyMessages::messageReceiverName(), WebContextLegacyMessages::postSynchronousMessageMessageName(), 0, syncRequestID);
     123    OwnPtr<CoreIPC::MessageEncoder> encoder = WebProcess::shared().parentProcessConnection()->createSyncMessageEncoder(WebContextLegacyMessages::messageReceiverName(), WebContextLegacyMessages::postSynchronousMessageMessageName(), 0, syncRequestID);
    124124    encoder->encode(messageName);
    125125    encoder->encode(InjectedBundleUserMessageEncoder(messageBody));
    126126
    127     OwnPtr<CoreIPC::MessageDecoder> replyDecoder = WebProcess::shared().connection()->sendSyncMessage(syncRequestID, encoder.release(), CoreIPC::Connection::NoTimeout);
     127    OwnPtr<CoreIPC::MessageDecoder> replyDecoder = WebProcess::shared().parentProcessConnection()->sendSyncMessage(syncRequestID, encoder.release(), CoreIPC::Connection::NoTimeout);
    128128    if (!replyDecoder || !replyDecoder->decode(messageDecoder)) {
    129129        returnData = nullptr;
  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp

    r149389 r150669  
    6060}
    6161
    62 CoreIPC::Connection* WebResourceLoader::connection() const
     62CoreIPC::Connection* WebResourceLoader::messageSenderConnection()
    6363{
    6464    return WebProcess::shared().networkConnection()->connection();
    6565}
    6666
    67 uint64_t WebResourceLoader::destinationID() const
     67uint64_t WebResourceLoader::messageSenderDestinationID()
    6868{
    6969    return m_coreLoader->identifier();
  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h

    r149251 r150669  
    5454typedef uint64_t ResourceLoadIdentifier;
    5555
    56 class WebResourceLoader : public RefCounted<WebResourceLoader>, public CoreIPC::MessageSender<WebResourceLoader> {
     56class WebResourceLoader : public RefCounted<WebResourceLoader>, public CoreIPC::MessageSender {
    5757public:
    5858    static PassRefPtr<WebResourceLoader> create(PassRefPtr<WebCore::ResourceLoader>);
    5959
    6060    ~WebResourceLoader();
    61 
    62     // Used by MessageSender.
    63     CoreIPC::Connection* connection() const;
    64     uint64_t destinationID() const;
    6561
    6662    void didReceiveWebResourceLoaderMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
     
    7268private:
    7369    WebResourceLoader(PassRefPtr<WebCore::ResourceLoader>);
     70
     71    // CoreIPC::MessageSender
     72    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     73    virtual uint64_t messageSenderDestinationID() OVERRIDE;
    7474
    7575    void cancelResourceLoader();
  • trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp

    r145453 r150669  
    154154
    155155#if ENABLE(NOTIFICATIONS)
    156     m_process->connection()->send(Messages::WebPageProxy::ShowNotification(notification->title(), notification->body(), notification->iconURL().string(), notification->tag(), notification->lang(), notification->dir(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
    157 #else
    158     m_process->connection()->send(Messages::WebPageProxy::ShowNotification(notification->title(), notification->body(), notification->iconURL().string(), notification->replaceId(), notification->lang(), notification->dir(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
     156    m_process->parentProcessConnection()->send(Messages::WebPageProxy::ShowNotification(notification->title(), notification->body(), notification->iconURL().string(), notification->tag(), notification->lang(), notification->dir(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
     157#else
     158    m_process->parentProcessConnection()->send(Messages::WebPageProxy::ShowNotification(notification->title(), notification->body(), notification->iconURL().string(), notification->replaceId(), notification->lang(), notification->dir(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
    159159#endif
    160160    return true;
     
    176176        return;
    177177   
    178     m_process->connection()->send(Messages::WebNotificationManagerProxy::Cancel(notificationID), 0);
     178    m_process->parentProcessConnection()->send(Messages::WebNotificationManagerProxy::Cancel(notificationID), 0);
    179179#else
    180180    UNUSED_PARAM(notification);
     
    191191   
    192192    Vector<uint64_t>& notificationIDs = it->value;
    193     m_process->connection()->send(Messages::WebNotificationManagerProxy::ClearNotifications(notificationIDs), 0);
     193    m_process->parentProcessConnection()->send(Messages::WebNotificationManagerProxy::ClearNotifications(notificationIDs), 0);
    194194    size_t count = notificationIDs.size();
    195195    for (size_t i = 0; i < count; ++i) {
     
    217217    m_notificationIDMap.remove(notificationID);
    218218    removeNotificationFromContextMap(notificationID, notification);
    219     m_process->connection()->send(Messages::WebNotificationManagerProxy::DidDestroyNotification(notificationID), 0);
     219    m_process->parentProcessConnection()->send(Messages::WebNotificationManagerProxy::DidDestroyNotification(notificationID), 0);
    220220#else
    221221    UNUSED_PARAM(notification);
  • trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm

    r150064 r150669  
    882882        pasteboardTypes.append(type);
    883883
    884     WebProcess::shared().connection()->send(Messages::WebContext::SetPasteboardTypes(NSGeneralPboard, pasteboardTypes), 0);
     884    WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::SetPasteboardTypes(NSGeneralPboard, pasteboardTypes), 0);
    885885
    886886    for (NSUInteger i = 0, count = items.count; i < count; ++i) {
     
    896896        if ([type isEqualToString:NSStringPboardType] || [type isEqualToString:NSPasteboardTypeString]) {
    897897            RetainPtr<NSString> plainTextString = adoptNS([[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
    898             WebProcess::shared().connection()->send(Messages::WebContext::SetPasteboardStringForType(NSGeneralPboard, type, plainTextString.get()), 0);
     898            WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::SetPasteboardStringForType(NSGeneralPboard, type, plainTextString.get()), 0);
    899899        } else {
    900900            RefPtr<SharedBuffer> buffer = SharedBuffer::wrapNSData(data);
     
    907907            memcpy(sharedMemory->data(), buffer->data(), buffer->size());
    908908            sharedMemory->createHandle(handle, SharedMemory::ReadOnly);
    909             WebProcess::shared().connection()->send(Messages::WebContext::SetPasteboardBufferForType(NSGeneralPboard, type, handle, buffer->size()), 0);
     909            WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::SetPasteboardBufferForType(NSGeneralPboard, type, handle, buffer->size()), 0);
    910910        }
    911911    }
  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp

    r150486 r150669  
    7171    CoreIPC::Attachment encodedConnectionIdentifier;
    7272    bool supportsAsynchronousInitialization;
    73     if (!WebProcess::shared().connection()->sendSync(Messages::WebProcessProxy::GetPluginProcessConnection(pluginProcessToken),
     73    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPluginProcessConnection(pluginProcessToken),
    7474                                                     Messages::WebProcessProxy::GetPluginProcessConnection::Reply(encodedConnectionIdentifier, supportsAsynchronousInitialization), 0))
    7575        return 0;
  • trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp

    r150313 r150669  
    6969{
    7070    if (m_storageType == LocalStorage)
    71         WebProcess::shared().connection()->send(Messages::StorageManager::CreateLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
     71        WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
    7272    else
    73         WebProcess::shared().connection()->send(Messages::StorageManager::CreateSessionStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
     73        WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateSessionStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
    7474    WebProcess::shared().addMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageMapID, this);
    7575}
     
    7777StorageAreaMap::~StorageAreaMap()
    7878{
    79     WebProcess::shared().connection()->send(Messages::StorageManager::DestroyStorageMap(m_storageMapID), 0);
     79    WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::DestroyStorageMap(m_storageMapID), 0);
    8080    WebProcess::shared().removeMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageMapID);
    8181}
     
    119119    m_pendingValueChanges.add(key);
    120120
    121     WebProcess::shared().connection()->send(Messages::StorageManager::SetItem(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, key, value, sourceFrame->document()->url()), 0);
     121    WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::SetItem(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, key, value, sourceFrame->document()->url()), 0);
    122122}
    123123
     
    135135    m_pendingValueChanges.add(key);
    136136
    137     WebProcess::shared().connection()->send(Messages::StorageManager::RemoveItem(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, key, sourceFrame->document()->url()), 0);
     137    WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::RemoveItem(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, key, sourceFrame->document()->url()), 0);
    138138}
    139139
     
    144144    m_hasPendingClear = true;
    145145    m_storageMap = StorageMap::create(m_quotaInBytes);
    146     WebProcess::shared().connection()->send(Messages::StorageManager::Clear(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, sourceFrame->document()->url()), 0);
     146    WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::Clear(m_storageMapID, sourceArea->storageAreaID(), m_currentSeed, sourceFrame->document()->url()), 0);
    147147}
    148148
     
    173173    // (This flag does not yet exist). Since loadValuesIfNeeded() ends up being called from within JavaScript code, processing incoming synchronous messages
    174174    // could lead to weird reentrency bugs otherwise.
    175     WebProcess::shared().connection()->sendSync(Messages::StorageManager::GetValues(m_storageMapID, m_currentSeed), Messages::StorageManager::GetValues::Reply(values), 0);
     175    WebProcess::shared().parentProcessConnection()->sendSync(Messages::StorageManager::GetValues(m_storageMapID, m_currentSeed), Messages::StorageManager::GetValues::Reply(values), 0);
    176176
    177177    m_storageMap = StorageMap::create(m_quotaInBytes);
  • trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp

    r135347 r150669  
    6464}
    6565
    66 CoreIPC::Connection* WebConnectionToUIProcess::connection() const
    67 {
    68     return m_process->connection();
    69 }
    70 
    71 uint64_t WebConnectionToUIProcess::destinationID() const
    72 {
    73     return 0;
    74 }
    75 
    7666bool WebConnectionToUIProcess::hasValidConnection() const
    7767{
     
    7969}
    8070
     71CoreIPC::Connection* WebConnectionToUIProcess::messageSenderConnection()
     72{
     73    return m_process->parentProcessConnection();
     74}
     75
     76uint64_t WebConnectionToUIProcess::messageSenderDestinationID()
     77{
     78    return 0;
     79}
     80
    8181} // namespace WebKit
  • trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h

    r135347 r150669  
    4545    virtual void encodeMessageBody(CoreIPC::ArgumentEncoder&, APIObject*) OVERRIDE;
    4646    virtual bool decodeMessageBody(CoreIPC::ArgumentDecoder&, RefPtr<APIObject>&) OVERRIDE;
    47     virtual CoreIPC::Connection* connection() const OVERRIDE;
    48     virtual uint64_t destinationID() const OVERRIDE;
    4947    virtual bool hasValidConnection() const OVERRIDE;
     48
     49    // CoreIPC::MessageSender
     50    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     51    virtual uint64_t messageSenderDestinationID() OVERRIDE;
    5052
    5153    WebProcess* m_process;
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r150441 r150669  
    122122    FloatRect newWindowFrame;
    123123
    124     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page->pageID()))
     124    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetWindowFrame(), Messages::WebPageProxy::GetWindowFrame::Reply(newWindowFrame), m_page->pageID()))
    125125        return FloatRect();
    126126
     
    183183    WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
    184184
    185     WebProcess::shared().connection()->send(Messages::WebPageProxy::FocusedFrameChanged(webFrame ? webFrame->frameID() : 0), m_page->pageID());
     185    WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::FocusedFrameChanged(webFrame ? webFrame->frameID() : 0), m_page->pageID());
    186186}
    187187
     
    193193    uint64_t newPageID = 0;
    194194    WebPageCreationParameters parameters;
    195     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::CreateNewPage(request.resourceRequest(), windowFeatures, modifiers, mouseButton), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page->pageID()))
     195    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::CreateNewPage(request.resourceRequest(), windowFeatures, modifiers, mouseButton), Messages::WebPageProxy::CreateNewPage::Reply(newPageID, parameters), m_page->pageID()))
    196196        return 0;
    197197
     
    230230   
    231231    bool toolbarsAreVisible = true;
    232     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page->pageID()))
     232    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), m_page->pageID()))
    233233        return true;
    234234
     
    248248
    249249    bool statusBarIsVisible = true;
    250     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page->pageID()))
     250    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), m_page->pageID()))
    251251        return true;
    252252
     
    277277   
    278278    bool menuBarIsVisible = true;
    279     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page->pageID()))
     279    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), m_page->pageID()))
    280280        return true;
    281281
     
    308308
    309309    bool shouldClose = false;
    310     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunBeforeUnloadConfirmPanel(message, webFrame->frameID()), Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::Reply(shouldClose), m_page->pageID()))
     310    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunBeforeUnloadConfirmPanel(message, webFrame->frameID()), Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::Reply(shouldClose), m_page->pageID()))
    311311        return false;
    312312
     
    343343
    344344    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
    345     WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags);
     345    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags);
    346346}
    347347
     
    357357    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
    358358    bool result = false;
    359     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags))
     359    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags))
    360360        return false;
    361361
     
    373373
    374374    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
    375     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags))
     375    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags))
    376376        return false;
    377377
     
    390390{
    391391    bool shouldInterrupt = false;
    392     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::ShouldInterruptJavaScript(), Messages::WebPageProxy::ShouldInterruptJavaScript::Reply(shouldInterrupt), m_page->pageID()))
     392    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::ShouldInterruptJavaScript(), Messages::WebPageProxy::ShouldInterruptJavaScript::Reply(shouldInterrupt), m_page->pageID()))
    393393        return false;
    394394
     
    596596
    597597    if (!newQuota) {
    598         WebProcess::shared().connection()->sendSync(
     598        WebProcess::shared().parentProcessConnection()->sendSync(
    599599            Messages::WebPageProxy::ExceededDatabaseQuota(webFrame->frameID(), origin->databaseIdentifier(), databaseName, details.displayName(), currentQuota, currentOriginUsage, details.currentUsage(), details.expectedUsage()),
    600600            Messages::WebPageProxy::ExceededDatabaseQuota::Reply(newQuota), m_page->pageID());
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.cpp

    r127988 r150669  
    4444{
    4545    m_page->setActiveColorChooser(this);
    46     WebProcess::shared().connection()->send(Messages::WebPageProxy::ShowColorChooser(initialColor, client->elementRectRelativeToRootView()), m_page->pageID());
     46    WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorChooser(initialColor, client->elementRectRelativeToRootView()), m_page->pageID());
    4747}
    4848
     
    7575        return;
    7676
    77     WebProcess::shared().connection()->send(Messages::WebPageProxy::SetColorChooserColor(color), m_page->pageID());
     77    WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::SetColorChooserColor(color), m_page->pageID());
    7878}
    7979
     
    8383        return;
    8484
    85     WebProcess::shared().connection()->send(Messages::WebPageProxy::EndColorChooser(), m_page->pageID());
     85    WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::EndColorChooser(), m_page->pageID());
    8686}
    8787
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r150388 r150669  
    376376void WebFrameLoaderClient::dispatchDidReceiveIcon()
    377377{
    378     WebProcess::shared().connection()->send(Messages::WebIconDatabase::DidReceiveIconForPageURL(m_frame->url()), 0);
     378    WebProcess::shared().parentProcessConnection()->send(Messages::WebIconDatabase::DidReceiveIconForPageURL(m_frame->url()), 0);
    379379}
    380380
     
    921921    data.originalRequest = loader->originalRequestCopy();
    922922
    923     WebProcess::shared().connection()->send(Messages::WebProcessProxy::DidNavigateWithNavigationData(webPage->pageID(), data, m_frame->frameID()), 0);
     923    WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::DidNavigateWithNavigationData(webPage->pageID(), data, m_frame->frameID()), 0);
    924924}
    925925
     
    935935    // Client redirect
    936936    if (!loader->clientRedirectSourceForHistory().isNull()) {
    937         WebProcess::shared().connection()->send(Messages::WebProcessProxy::DidPerformClientRedirect(webPage->pageID(),
     937        WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::DidPerformClientRedirect(webPage->pageID(),
    938938            loader->clientRedirectSourceForHistory(), loader->clientRedirectDestinationForHistory(), m_frame->frameID()), 0);
    939939    }
     
    941941    // Server redirect
    942942    if (!loader->serverRedirectSourceForHistory().isNull()) {
    943         WebProcess::shared().connection()->send(Messages::WebProcessProxy::DidPerformServerRedirect(webPage->pageID(),
     943        WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::DidPerformServerRedirect(webPage->pageID(),
    944944            loader->serverRedirectSourceForHistory(), loader->serverRedirectDestinationForHistory(), m_frame->frameID()), 0);
    945945    }
     
    11761176
    11771177    // FIXME: use direction of title.
    1178     WebProcess::shared().connection()->send(Messages::WebProcessProxy::DidUpdateHistoryTitle(webPage->pageID(),
     1178    WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::DidUpdateHistoryTitle(webPage->pageID(),
    11791179        title.string(), url.string(), m_frame->frameID()), 0);
    11801180}
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

    r150322 r150669  
    297297   
    298298    // FIXME: Should we do something in case of error here?
    299     if (!WebProcess::shared().connection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins), 0))
     299    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins), 0))
    300300        return;
    301301
     
    364364void WebPlatformStrategies::getTypes(Vector<String>& types, const String& pasteboardName)
    365365{
    366     WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardTypes(pasteboardName),
     366    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::GetPasteboardTypes(pasteboardName),
    367367                                                Messages::WebContext::GetPasteboardTypes::Reply(types), 0);
    368368}
     
    372372    SharedMemory::Handle handle;
    373373    uint64_t size = 0;
    374     WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardBufferForType(pasteboardName, pasteboardType),
     374    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::GetPasteboardBufferForType(pasteboardName, pasteboardType),
    375375                                                Messages::WebContext::GetPasteboardBufferForType::Reply(handle, size), 0);
    376376    if (handle.isNull())
     
    382382void WebPlatformStrategies::getPathnamesForType(Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName)
    383383{
    384     WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardPathnamesForType(pasteboardName, pasteboardType),
     384    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::GetPasteboardPathnamesForType(pasteboardName, pasteboardType),
    385385                                                Messages::WebContext::GetPasteboardPathnamesForType::Reply(pathnames), 0);
    386386}
     
    389389{
    390390    String value;
    391     WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardStringForType(pasteboardName, pasteboardType),
     391    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::GetPasteboardStringForType(pasteboardName, pasteboardType),
    392392                                                Messages::WebContext::GetPasteboardStringForType::Reply(value), 0);
    393393    return value;
     
    396396void WebPlatformStrategies::copy(const String& fromPasteboard, const String& toPasteboard)
    397397{
    398     WebProcess::shared().connection()->send(Messages::WebContext::PasteboardCopy(fromPasteboard, toPasteboard), 0);
     398    WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::PasteboardCopy(fromPasteboard, toPasteboard), 0);
    399399}
    400400
     
    402402{
    403403    uint64_t changeCount;
    404     WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardChangeCount(pasteboardName),
     404    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::GetPasteboardChangeCount(pasteboardName),
    405405                                                Messages::WebContext::GetPasteboardChangeCount::Reply(changeCount), 0);
    406406    return changeCount;
     
    410410{
    411411    String pasteboardName;
    412     WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardUniqueName(),
     412    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::GetPasteboardUniqueName(),
    413413                                                Messages::WebContext::GetPasteboardUniqueName::Reply(pasteboardName), 0);
    414414    return pasteboardName;
     
    418418{
    419419    Color color;
    420     WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardColor(pasteboardName),
     420    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::GetPasteboardColor(pasteboardName),
    421421                                                Messages::WebContext::GetPasteboardColor::Reply(color), 0);
    422422    return color;
     
    426426{
    427427    String urlString;
    428     WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPasteboardURL(pasteboardName),
     428    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebContext::GetPasteboardURL(pasteboardName),
    429429                                                Messages::WebContext::GetPasteboardURL::Reply(urlString), 0);
    430430    return KURL(ParsedURLString, urlString);
     
    433433void WebPlatformStrategies::addTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName)
    434434{
    435     WebProcess::shared().connection()->send(Messages::WebContext::AddPasteboardTypes(pasteboardName, pasteboardTypes), 0);
     435    WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::AddPasteboardTypes(pasteboardName, pasteboardTypes), 0);
    436436}
    437437
    438438void WebPlatformStrategies::setTypes(const Vector<String>& pasteboardTypes, const String& pasteboardName)
    439439{
    440     WebProcess::shared().connection()->send(Messages::WebContext::SetPasteboardTypes(pasteboardName, pasteboardTypes), 0);
     440    WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::SetPasteboardTypes(pasteboardName, pasteboardTypes), 0);
    441441}
    442442
     
    449449        sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
    450450    }
    451     WebProcess::shared().connection()->send(Messages::WebContext::SetPasteboardBufferForType(pasteboardName, pasteboardType, handle, buffer ? buffer->size() : 0), 0);
     451    WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::SetPasteboardBufferForType(pasteboardName, pasteboardType, handle, buffer ? buffer->size() : 0), 0);
    452452}
    453453
    454454void WebPlatformStrategies::setPathnamesForType(const Vector<String>& pathnames, const String& pasteboardType, const String& pasteboardName)
    455455{
    456     WebProcess::shared().connection()->send(Messages::WebContext::SetPasteboardPathnamesForType(pasteboardName, pasteboardType, pathnames), 0);
     456    WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::SetPasteboardPathnamesForType(pasteboardName, pasteboardType, pathnames), 0);
    457457}
    458458
    459459void WebPlatformStrategies::setStringForType(const String& string, const String& pasteboardType, const String& pasteboardName)
    460460{
    461     WebProcess::shared().connection()->send(Messages::WebContext::SetPasteboardStringForType(pasteboardName, pasteboardType, string), 0);
     461    WebProcess::shared().parentProcessConnection()->send(Messages::WebContext::SetPasteboardStringForType(pasteboardName, pasteboardType, string), 0);
    462462}
    463463#endif
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp

    r139023 r150669  
    118118    setUpPlatformData(pageCoordinates, platformData);
    119119
    120     WebProcess::shared().connection()->send(Messages::WebPageProxy::ShowPopupMenu(pageCoordinates, m_popupClient->menuStyle().textDirection(), items, index, platformData), m_page->pageID());
     120    WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::ShowPopupMenu(pageCoordinates, m_popupClient->menuStyle().textDirection(), items, index, platformData), m_page->pageID());
    121121}
    122122
     
    126126        return;
    127127
    128     WebProcess::shared().connection()->send(Messages::WebPageProxy::HidePopupMenu(), m_page->pageID());
     128    WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::HidePopupMenu(), m_page->pageID());
    129129    m_page->setActivePopupMenu(0);
    130130}
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp

    r84011 r150669  
    5757        return;
    5858
    59     WebProcess::shared().connection()->send(Messages::WebPageProxy::SaveRecentSearches(name, searchItems), page->pageID());
     59    WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::SaveRecentSearches(name, searchItems), page->pageID());
    6060}
    6161
     
    6969        return;
    7070
    71     WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::LoadRecentSearches(name), Messages::WebPageProxy::LoadRecentSearches::Reply(resultItems), page->pageID());
     71    WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::LoadRecentSearches(name), Messages::WebPageProxy::LoadRecentSearches::Reply(resultItems), page->pageID());
    7272}
    7373
  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp

    r149665 r150669  
    147147void EventDispatcher::sendDidReceiveEvent(uint64_t pageID, const WebEvent& event, bool didHandleEvent)
    148148{
    149     WebProcess::shared().connection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(event.type()), didHandleEvent), pageID);
     149    WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(event.type()), didHandleEvent), pageID);
    150150}
    151151#endif
  • trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp

    r149848 r150669  
    9090    item->encodeBackForwardTree(encoder);
    9191
    92     WebProcess::shared().connection()->send(Messages::WebProcessProxy::AddBackForwardItem(itemID, item->originalURLString(), item->urlString(), item->title(), encoder.dataReference()), 0);
     92    WebProcess::shared().parentProcessConnection()->send(Messages::WebProcessProxy::AddBackForwardItem(itemID, item->originalURLString(), item->urlString(), item->title(), encoder.dataReference()), 0);
    9393}
    9494
     
    181181
    182182    uint64_t itemID = 0;
    183     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardItemAtIndex(itemIndex), Messages::WebPageProxy::BackForwardItemAtIndex::Reply(itemID), m_page->pageID()))
     183    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardItemAtIndex(itemIndex), Messages::WebPageProxy::BackForwardItemAtIndex::Reply(itemID), m_page->pageID()))
    184184        return 0;
    185185
     
    196196
    197197    int backListCount = 0;
    198     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardBackListCount(), Messages::WebPageProxy::BackForwardBackListCount::Reply(backListCount), m_page->pageID()))
     198    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardBackListCount(), Messages::WebPageProxy::BackForwardBackListCount::Reply(backListCount), m_page->pageID()))
    199199        return 0;
    200200
     
    208208
    209209    int forwardListCount = 0;
    210     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::BackForwardForwardListCount(), Messages::WebPageProxy::BackForwardForwardListCount::Reply(forwardListCount), m_page->pageID()))
     210    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::BackForwardForwardListCount(), Messages::WebPageProxy::BackForwardForwardListCount::Reply(forwardListCount), m_page->pageID()))
    211211        return 0;
    212212
  • trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp

    r150041 r150669  
    7979    WebPageCreationParameters parameters;
    8080
    81     if (!WebProcess::shared().connection()->sendSync(Messages::WebInspectorProxy::CreateInspectorPage(),
     81    if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebInspectorProxy::CreateInspectorPage(),
    8282            Messages::WebInspectorProxy::CreateInspectorPage::Reply(inspectorPageID, parameters),
    8383            m_page->pageID(), CoreIPC::Connection::NoTimeout)) {
     
    108108void WebInspector::didClose()
    109109{
    110     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::DidClose(), m_page->pageID());
     110    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_page->pageID());
    111111    destroyInspectorPage();
    112112}
     
    114114void WebInspector::bringToFront()
    115115{
    116     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::BringToFront(), m_page->pageID());
     116    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::BringToFront(), m_page->pageID());
    117117}
    118118
    119119void WebInspector::inspectedURLChanged(const String& urlString)
    120120{
    121     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::InspectedURLChanged(urlString), m_page->pageID());
     121    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::InspectedURLChanged(urlString), m_page->pageID());
    122122}
    123123
    124124void WebInspector::save(const String& filename, const String& content, bool forceSaveAs)
    125125{
    126     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::Save(filename, content, forceSaveAs), m_page->pageID());
     126    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::Save(filename, content, forceSaveAs), m_page->pageID());
    127127}
    128128
    129129void WebInspector::append(const String& filename, const String& content)
    130130{
    131     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::Append(filename, content), m_page->pageID());
     131    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::Append(filename, content), m_page->pageID());
    132132}
    133133
    134134void WebInspector::attachBottom()
    135135{
    136     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::AttachBottom(), m_page->pageID());
     136    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachBottom(), m_page->pageID());
    137137}
    138138
    139139void WebInspector::attachRight()
    140140{
    141     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::AttachRight(), m_page->pageID());
     141    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachRight(), m_page->pageID());
    142142}
    143143
    144144void WebInspector::detach()
    145145{
    146     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::Detach(), m_page->pageID());
     146    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::Detach(), m_page->pageID());
    147147}
    148148
    149149void WebInspector::setAttachedWindowHeight(unsigned height)
    150150{
    151     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::SetAttachedWindowHeight(height), m_page->pageID());
     151    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SetAttachedWindowHeight(height), m_page->pageID());
    152152}
    153153
    154154void WebInspector::setAttachedWindowWidth(unsigned width)
    155155{
    156     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::SetAttachedWindowWidth(width), m_page->pageID());
     156    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SetAttachedWindowWidth(width), m_page->pageID());
    157157}
    158158
    159159void WebInspector::setToolbarHeight(unsigned height)
    160160{
    161     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::SetToolbarHeight(height), m_page->pageID());
     161    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SetToolbarHeight(height), m_page->pageID());
    162162}
    163163
     
    300300
    301301    bool canAttachWindow = m_frontendClient->canAttachWindow();
    302     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::AttachAvailabilityChanged(canAttachWindow), m_page->pageID());
     302    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::AttachAvailabilityChanged(canAttachWindow), m_page->pageID());
    303303    m_frontendClient->setDockingUnavailable(!canAttachWindow);
    304304}
     
    308308{
    309309    ASSERT(m_remoteFrontendConnected);
    310     WebProcess::shared().connection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
     310    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
    311311}
    312312
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r150663 r150669  
    455455}
    456456
    457 CoreIPC::Connection* WebPage::connection() const
    458 {
    459     return WebProcess::shared().connection();
     457CoreIPC::Connection* WebPage::messageSenderConnection()
     458{
     459    return WebProcess::shared().parentProcessConnection();
     460}
     461
     462uint64_t WebPage::messageSenderDestinationID()
     463{
     464    return pageID();
    460465}
    461466
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r150521 r150669  
    168168typedef Vector<RefPtr<PageOverlay>> PageOverlayList;
    169169
    170 class WebPage : public TypedAPIObject<APIObject::TypeBundlePage>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender<WebPage> {
     170class WebPage : public TypedAPIObject<APIObject::TypeBundlePage>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
    171171public:
    172172    static PassRefPtr<WebPage> create(uint64_t pageID, const WebPageCreationParameters&);
    173173    virtual ~WebPage();
    174 
    175     // Used by MessageSender.
    176     CoreIPC::Connection* connection() const;
    177     uint64_t destinationID() const { return pageID(); }
    178174
    179175    void close();
     
    664660    WebPage(uint64_t pageID, const WebPageCreationParameters&);
    665661
     662    // CoreIPC::MessageSender
     663    virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
     664    virtual uint64_t messageSenderDestinationID() OVERRIDE;
     665
    666666    void platformInitialize();
    667667
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r150653 r150669  
    188188            } else {
    189189                bool commandWasHandledByUIProcess = false;
    190                 WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::ExecuteSavedCommandBySelector(commands[i].commandName),
     190                WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::ExecuteSavedCommandBySelector(commands[i].commandName),
    191191                    Messages::WebPageProxy::ExecuteSavedCommandBySelector::Reply(commandWasHandledByUIProcess), m_pageID);
    192192                eventWasHandled |= commandWasHandledByUIProcess;
     
    216216        KeyboardEvent* oldEvent = m_keyboardEventBeingInterpreted;
    217217        m_keyboardEventBeingInterpreted = event;
    218         bool sendResult = WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::InterpretQueuedKeyEvent(editorState()),
     218        bool sendResult = WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::InterpretQueuedKeyEvent(editorState()),
    219219            Messages::WebPageProxy::InterpretQueuedKeyEvent::Reply(eventWasHandled, commands), m_pageID);
    220220        m_keyboardEventBeingInterpreted = oldEvent;
  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r150314 r150669  
    371371    CoreIPC::Attachment encodedConnectionIdentifier;
    372372
    373     if (!connection()->sendSync(Messages::WebProcessProxy::GetNetworkProcessConnection(),
     373    if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetNetworkProcessConnection(),
    374374        Messages::WebProcessProxy::GetNetworkProcessConnection::Reply(encodedConnectionIdentifier), 0))
    375375        return;
     
    606606    // FIXME: the ShouldTerminate message should also send termination parameters, such as any session cookies that need to be preserved.
    607607    bool shouldTerminate = false;
    608     if (connection()->sendSync(Messages::WebProcessProxy::ShouldTerminate(), Messages::WebProcessProxy::ShouldTerminate::Reply(shouldTerminate), 0)
     608    if (parentProcessConnection()->sendSync(Messages::WebProcessProxy::ShouldTerminate(), Messages::WebProcessProxy::ShouldTerminate::Reply(shouldTerminate), 0)
    609609        && !shouldTerminate)
    610610        return false;
Note: See TracChangeset for help on using the changeset viewer.