Changeset 132366 in webkit


Ignore:
Timestamp:
Oct 24, 2012, 10:22:19 AM (13 years ago)
Author:
weinig@apple.com
Message:

Move a few more WebProcess sub-objects to be MessageReceivers
​https://bugs.webkit.org/show_bug.cgi?id=100186

Reviewed by Anders Carlsson.

  • WebProcess/Battery/WebBatteryManager.cpp:

(WebKit::WebBatteryManager::WebBatteryManager):

  • WebProcess/Battery/WebBatteryManager.h:

(WebBatteryManager):

  • WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:

(WebKit::WebIconDatabaseProxy::WebIconDatabaseProxy):
(WebKit):

  • WebProcess/IconDatabase/WebIconDatabaseProxy.h:

(WebIconDatabaseProxy):

  • WebProcess/NetworkInfo/WebNetworkInfoManager.cpp:

(WebKit::WebNetworkInfoManager::WebNetworkInfoManager):

  • WebProcess/NetworkInfo/WebNetworkInfoManager.h:

(WebNetworkInfoManager):

  • WebProcess/Notifications/WebNotificationManager.cpp:

(WebKit::WebNotificationManager::WebNotificationManager):

  • WebProcess/Notifications/WebNotificationManager.h:

(WebNotificationManager):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::didReceiveMessage):

  • WebProcess/soup/WebSoupRequestManager.cpp:

(WebKit::WebSoupRequestManager::WebSoupRequestManager):

  • WebProcess/soup/WebSoupRequestManager.h:

(WebSoupRequestManager):

Location:
trunk/Source/WebKit2
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r132361 r132366  
     12012-10-23  Sam Weinig  <sam@webkit.org>
     2
     3        Move a few more WebProcess sub-objects to be MessageReceivers
     4        https://bugs.webkit.org/show_bug.cgi?id=100186
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebProcess/Battery/WebBatteryManager.cpp:
     9        (WebKit::WebBatteryManager::WebBatteryManager):
     10        * WebProcess/Battery/WebBatteryManager.h:
     11        (WebBatteryManager):
     12        * WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:
     13        (WebKit::WebIconDatabaseProxy::WebIconDatabaseProxy):
     14        (WebKit):
     15        * WebProcess/IconDatabase/WebIconDatabaseProxy.h:
     16        (WebIconDatabaseProxy):
     17        * WebProcess/NetworkInfo/WebNetworkInfoManager.cpp:
     18        (WebKit::WebNetworkInfoManager::WebNetworkInfoManager):
     19        * WebProcess/NetworkInfo/WebNetworkInfoManager.h:
     20        (WebNetworkInfoManager):
     21        * WebProcess/Notifications/WebNotificationManager.cpp:
     22        (WebKit::WebNotificationManager::WebNotificationManager):
     23        * WebProcess/Notifications/WebNotificationManager.h:
     24        (WebNotificationManager):
     25        * WebProcess/WebProcess.cpp:
     26        (WebKit::WebProcess::didReceiveMessage):
     27        * WebProcess/soup/WebSoupRequestManager.cpp:
     28        (WebKit::WebSoupRequestManager::WebSoupRequestManager):
     29        * WebProcess/soup/WebSoupRequestManager.h:
     30        (WebSoupRequestManager):
     31
    1322012-10-23  Anders Carlsson  <andersca@apple.com>
    233

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

    r131807 r132366  
    2929#if ENABLE(BATTERY_STATUS)
    3030
     31#include "WebBatteryManagerMessages.h"
    3132#include "WebBatteryManagerProxyMessages.h"
    3233#include "WebPage.h"
    … …  
    4344    : m_process(process)
    4445{
     46    m_process->addMessageReceiver(Messages::WebBatteryManager::messageReceiverName(), this);
    4547}
    4648

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

    r131807 r132366  
    2929#if ENABLE(BATTERY_STATUS)
    3030
    31 #include "MessageID.h"
     31#include "MessageReceiver.h"
    3232#include "WebBatteryStatus.h"
    3333#include "WebCoreArgumentCoders.h"
    … …  
    3636#include <wtf/text/AtomicString.h>
    3737
    38 namespace CoreIPC {
    39 class Connection;
    40 class MessageDecoder;
    41 }
    42 
    4338namespace WebKit {
    4439
    … …  
    4641class WebProcess;
    4742
    48 class WebBatteryManager {
     43class WebBatteryManager : private CoreIPC::MessageReceiver {
    4944    WTF_MAKE_NONCOPYABLE(WebBatteryManager);
    5045
    … …  
    5954    void updateBatteryStatus(const WebBatteryStatus::Data&);
    6055
    61     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     56private:
     57    // CoreIPC::MessageReceiver
     58    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    6259
    63 private:
    6460    // Implemented in generated WebBatteryManagerMessageReceiver.cpp
    6561    void didReceiveWebBatteryManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);

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

    r131807 r132366  
    2828
    2929#include "DataReference.h"
    30 #include "MessageID.h"
    3130#include "WebIconDatabaseMessages.h"
     31#include "WebIconDatabaseProxyMessages.h"
    3232#include "WebProcess.h"
    3333#include <WebCore/SharedBuffer.h>
    … …  
    4646    , m_process(process)
    4747{
     48    m_process->addMessageReceiver(Messages::WebIconDatabaseProxy::messageReceiverName(), this);
    4849}
    4950
    … …  
    6162    setGlobalIconDatabase(enabled ? this : 0);
    6263}
    63 
    6464
    6565void WebIconDatabaseProxy::retainIconForPageURL(const String& pageURL)

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

    r131807 r132366  
    2828
    2929#include "APIObject.h"
    30 
     30#include "MessageReceiver.h"
    3131#include <WebCore/IconDatabaseBase.h>
    32 
    3332#include <wtf/HashMap.h>
    3433#include <wtf/PassRefPtr.h>
    … …  
    3635#include <wtf/Vector.h>
    3736
    38 namespace CoreIPC {
    39 class Connection;
    40 class MessageDecoder;
    41 class MessageID;
    42 }
    43 
    4437namespace WebKit {
    4538
    4639class WebProcess;
    4740
    48 class WebIconDatabaseProxy : public WebCore::IconDatabaseBase {
     41class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private CoreIPC::MessageReceiver {
    4942public:
    5043    explicit WebIconDatabaseProxy(WebProcess*);
    … …  
    5346    virtual bool isEnabled() const;
    5447    void setEnabled(bool);
    55    
    56    
     48
    5749    virtual void retainIconForPageURL(const String&);
    5850    virtual void releaseIconForPageURL(const String&);
    … …  
    7062    void receivedIconLoadDecision(int decision, uint64_t callbackID);
    7163    virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>);
    72        
    73     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    74    
     64
    7565private:
     66    // CoreIPC::MessageReceiver
     67    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     68
     69    // Implemented in generated WebIconDatabaseProxyMessageReceiver.cpp
    7670    void didReceiveWebIconDatabaseProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    7771   

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

    r131807 r132366  
    2929#if ENABLE(NETWORK_INFO)
    3030
     31#include "WebNetworkInfoManagerMessages.h"
    3132#include "WebNetworkInfoManagerProxyMessages.h"
    3233#include "WebPage.h"
    … …  
    4344    : m_process(process)
    4445{
     46    m_process->addMessageReceiver(Messages::WebNetworkInfoManager::messageReceiverName(), this);
    4547}
    4648

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

    r131807 r132366  
    2929#if ENABLE(NETWORK_INFO)
    3030
    31 #include "MessageID.h"
     31#include "MessageReceiver.h"
    3232#include "WebCoreArgumentCoders.h"
    3333#include "WebNetworkInfo.h"
    … …  
    3636#include <wtf/text/AtomicString.h>
    3737
    38 namespace CoreIPC {
    39 class Connection;
    40 class MessageDecoder;
    41 }
    42 
    4338namespace WebKit {
    4439
    … …  
    4641class WebPage;
    4742
    48 class WebNetworkInfoManager {
     43class WebNetworkInfoManager : private CoreIPC::MessageReceiver {
    4944    WTF_MAKE_NONCOPYABLE(WebNetworkInfoManager);
    5045public:
    … …  
    5752    double bandwidth(WebPage*) const;
    5853    bool metered(WebPage*) const;
     54private:
     55    // CoreIPC::MessageReceiver
     56    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    5957
    60     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    61 
    62 private:
    6358    // Implemented in generated WebNetworkInfoManagerMessageReceiver.cpp
    6459    void didReceiveWebNetworkInfoManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);

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

    r131807 r132366  
    3232#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
    3333#include "WebNotification.h"
     34#include "WebNotificationManagerMessages.h"
    3435#include "WebNotificationManagerProxyMessages.h"
    3536#include "WebPageProxyMessages.h"
    … …  
    5859    : m_process(process)
    5960{
     61#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     62    m_process->addMessageReceiver(Messages::WebNotificationManager::messageReceiverName(), this);
     63#endif
    6064}
    6165

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

    r131807 r132366  
    2727#define WebNotificationManager_h
    2828
    29 #include "MessageID.h"
     29#include "MessageReceiver.h"
    3030#include <WebCore/NotificationClient.h>
    3131#include <wtf/HashMap.h>
    … …  
    3434#include <wtf/Vector.h>
    3535#include <wtf/text/StringHash.h>
    36 
    37 namespace CoreIPC {
    38 class Connection;
    39 class MessageDecoder;
    40 }
    4136
    4237namespace WebCore {
    … …  
    5045class WebProcess;
    5146
    52 class WebNotificationManager {
     47class WebNotificationManager : private CoreIPC::MessageReceiver {
    5348    WTF_MAKE_NONCOPYABLE(WebNotificationManager);
    5449public:
    … …  
    6459    void didDestroyNotification(WebCore::Notification*, WebPage*);
    6560
    66     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    6761    void didUpdateNotificationDecision(const String& originString, bool allowed);
    6862
    … …  
    7468
    7569private:
     70    // CoreIPC::MessageReceiver
     71    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
     72
    7673    // Implemented in generated WebNotificationManagerMessageReceiver.cpp
    7774    void didReceiveWebNotificationManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);

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

    r132161 r132366  
    693693#endif
    694694
    695 #if ENABLE(BATTERY_STATUS)
    696     if (messageID.is<CoreIPC::MessageClassWebBatteryManager>()) {
    697         m_batteryManager.didReceiveMessage(connection, messageID, decoder);
    698         return;
    699     }
    700 #endif
    701 
    702 #if ENABLE(NETWORK_INFO)
    703     if (messageID.is<CoreIPC::MessageClassWebNetworkInfoManager>()) {
    704         m_networkInfoManager.didReceiveMessage(connection, messageID, decoder);
    705         return;
    706     }
    707 #endif
    708 
    709     if (messageID.is<CoreIPC::MessageClassWebIconDatabaseProxy>()) {
    710         m_iconDatabaseProxy.didReceiveMessage(connection, messageID, decoder);
    711         return;
    712     }
    713 
    714695    if (messageID.is<CoreIPC::MessageClassWebKeyValueStorageManager>()) {
    715696        WebKeyValueStorageManager::shared().didReceiveMessage(connection, messageID, decoder);
    … …  
    721702        return;
    722703    }
    723 
    724 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
    725     if (messageID.is<CoreIPC::MessageClassWebNotificationManager>()) {
    726         m_notificationManager.didReceiveMessage(connection, messageID, decoder);
    727         return;
    728     }
    729 #endif
    730704   
    731705    if (messageID.is<CoreIPC::MessageClassWebResourceCacheManager>()) {
    … …  
    733707        return;
    734708    }
    735 
    736 #if USE(SOUP)
    737     if (messageID.is<CoreIPC::MessageClassWebSoupRequestManager>()) {
    738         m_soupRequestManager.didReceiveMessage(connection, messageID, decoder);
    739         return;
    740     }
    741 #endif
    742709   
    743710    if (messageID.is<CoreIPC::MessageClassWebPageGroupProxy>()) {

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

    r131807 r132366  
    2828#include "WebPageProxyMessages.h"
    2929#include "WebProcess.h"
     30#include "WebSoupRequestManagerMessages.h"
    3031#include "WebSoupRequestManagerProxyMessages.h"
    3132#include <WebCore/ResourceHandle.h>
    … …  
    8182    , m_schemes(adoptGRef(g_ptr_array_new_with_free_func(g_free)))
    8283{
     84    m_process->addMessageReceiver(Messages::WebSoupRequestManager::messageReceiverName(), this);
    8385}
    8486

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

    r131807 r132366  
    2121#define WebSoupRequestManager_h
    2222
     23#include "DataReference.h"
     24#include "MessageReceiver.h"
    2325#include <wtf/HashMap.h>
    2426#include <wtf/Noncopyable.h>
    … …  
    3032typedef struct _GSimpleAsyncResult GSimpleAsyncResult;
    3133
    32 namespace CoreIPC {
    33 class Connection;
    34 class DataReference;
    35 class MessageDecoder;
    36 class MessageID;
    37 }
    38 
    3934namespace WebKit {
    4035
    … …  
    4237struct WebSoupRequestAsyncData;
    4338
    44 class WebSoupRequestManager {
     39class WebSoupRequestManager : private CoreIPC::MessageReceiver {
    4540    WTF_MAKE_NONCOPYABLE(WebSoupRequestManager);
    4641public:
    … …  
    5146    GInputStream* finish(GSimpleAsyncResult*);
    5247
    53     void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     48private:
     49    // CoreIPC::MessageReceiver
     50    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
    5451
    55 private:
     52    // Implemented in generated WebSoupRequestManagerMessageReceiver.cpp
    5653    void didReceiveWebSoupRequestManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    5754
Note: See TracChangeset for help on using the changeset viewer.