Changeset 121989 in webkit


Ignore:
Timestamp:
Jul 6, 2012 12:12:12 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[WK2] Add support for Network Information API
​https://bugs.webkit.org/show_bug.cgi?id=89870

Patch by Christophe Dumez <Christophe Dumez> on 2012-07-06
Reviewed by Anders Carlsson.

Add Network Information API support for WebKit2.

  • CMakeLists.txt:
  • DerivedSources.pri:
  • GNUmakefile.am:
  • GNUmakefile.list.am:
  • Platform/CoreIPC/MessageID.h:
  • Shared/API/c/WKBase.h:
  • Shared/APIObject.h:
  • Shared/WebNetworkInfo.cpp: Added.

(WebKit):
(WebKit::WebNetworkInfo::WebNetworkInfo):
(WebKit::WebNetworkInfo::~WebNetworkInfo):
(WebKit::WebNetworkInfo::Data::encode):
(WebKit::WebNetworkInfo::Data::decode):

  • Shared/WebNetworkInfo.h: Added.

(WebKit):
(WebNetworkInfo):
(Data):
(WebKit::WebNetworkInfo::create):
(WebKit::WebNetworkInfo::bandwidth):
(WebKit::WebNetworkInfo::metered):
(WebKit::WebNetworkInfo::data):
(WebKit::WebNetworkInfo::type):

  • Target.pri:
  • UIProcess/API/C/WKAPICast.h:

(WebKit):

  • UIProcess/API/C/WKNetworkInfoManager.cpp: Added.

(WKNetworkInfoManagerGetTypeID):

  • UIProcess/API/C/WKNetworkInfoManager.h: Added.
  • UIProcess/WebNetworkInfoManagerProxy.cpp: Added.

(WebKit):
(WebKit::WebNetworkInfoManagerProxy::create):
(WebKit::WebNetworkInfoManagerProxy::WebNetworkInfoManagerProxy):
(WebKit::WebNetworkInfoManagerProxy::~WebNetworkInfoManagerProxy):
(WebKit::WebNetworkInfoManagerProxy::invalidate):
(WebKit::WebNetworkInfoManagerProxy::initializeProvider):
(WebKit::WebNetworkInfoManagerProxy::providerDidChangeNetworkInformation):
(WebKit::WebNetworkInfoManagerProxy::didReceiveMessage):
(WebKit::WebNetworkInfoManagerProxy::startUpdating):
(WebKit::WebNetworkInfoManagerProxy::stopUpdating):
(WebKit::WebNetworkInfoManagerProxy::getBandwidth):
(WebKit::WebNetworkInfoManagerProxy::isMetered):

  • UIProcess/WebNetworkInfoManagerProxy.h: Added.

(CoreIPC):
(WebKit):
(WebNetworkInfoManagerProxy):
(WebKit::WebNetworkInfoManagerProxy::clearContext):
(WebKit::WebNetworkInfoManagerProxy::type):

  • UIProcess/WebNetworkInfoManagerProxy.messages.in: Added.
  • UIProcess/WebNetworkInfoProvider.cpp: Added.

(WebKit):
(WebKit::WebNetworkInfoProvider::startUpdating):
(WebKit::WebNetworkInfoProvider::stopUpdating):
(WebKit::WebNetworkInfoProvider::bandwidth):
(WebKit::WebNetworkInfoProvider::metered):

  • UIProcess/WebNetworkInfoProvider.h: Added.

(WebKit):
(WebNetworkInfoProvider):

  • WebKit2.pri:
  • WebProcess/NetworkInfo/WebNetworkInfoManager.cpp: Added.

(WebKit):
(WebKit::WebNetworkInfoManager::WebNetworkInfoManager):
(WebKit::WebNetworkInfoManager::~WebNetworkInfoManager):
(WebKit::WebNetworkInfoManager::didReceiveMessage):
(WebKit::WebNetworkInfoManager::registerWebPage):
(WebKit::WebNetworkInfoManager::unregisterWebPage):
(WebKit::WebNetworkInfoManager::bandwidth):
(WebKit::WebNetworkInfoManager::metered):
(WebKit::WebNetworkInfoManager::didChangeNetworkInformation):

  • WebProcess/NetworkInfo/WebNetworkInfoManager.h: Added.

(CoreIPC):
(WebKit):
(WebNetworkInfoManager):

  • WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in: Added.
  • WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp: Added.

(WebKit):
(WebKit::WebNetworkInfoClient::~WebNetworkInfoClient):
(WebKit::WebNetworkInfoClient::bandwidth):
(WebKit::WebNetworkInfoClient::metered):
(WebKit::WebNetworkInfoClient::startUpdating):
(WebKit::WebNetworkInfoClient::stopUpdating):

  • WebProcess/WebCoreSupport/WebNetworkInfoClient.h: Added.

(WebKit):
(WebNetworkInfoClient):
(WebKit::WebNetworkInfoClient::WebNetworkInfoClient):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::didReceiveMessage):

  • WebProcess/WebProcess.h:

(WebProcess):
(WebKit::WebProcess::networkInfoManager):

Location:
trunk/Source/WebKit2
Files:
15 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/CMakeLists.txt

    r121919 r121989  
    2828    "${WEBKIT2_DIR}/WebProcess/FullScreen"
    2929    "${WEBKIT2_DIR}/WebProcess/Geolocation"
     30    "${WEBKIT2_DIR}/WebProcess/NetworkInfo"
    3031    "${WEBKIT2_DIR}/WebProcess/IconDatabase"
    3132    "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
    … …  
    157158    Shared/WebMemorySampler.cpp
    158159    Shared/WebMouseEvent.cpp
     160    Shared/WebNetworkInfo.cpp
    159161    Shared/WebOpenPanelParameters.cpp
    160162    Shared/WebPageCreationParameters.cpp
    … …  
    251253    UIProcess/WebMediaCacheManagerProxy.cpp
    252254    UIProcess/WebNavigationData.cpp
     255    UIProcess/WebNetworkInfoManagerProxy.cpp
     256    UIProcess/WebNetworkInfoProvider.cpp
    253257    UIProcess/WebOpenPanelResultListenerProxy.cpp
    254258    UIProcess/WebPageContextMenuClient.cpp
    … …  
    291295    UIProcess/API/C/WKMediaCacheManager.cpp
    292296    UIProcess/API/C/WKNavigationData.cpp
     297    UIProcess/API/C/WKNetworkInfoManager.cpp
    293298    UIProcess/API/C/WKNotification.cpp
    294299    UIProcess/API/C/WKNotificationManager.cpp
    … …  
    390395    WebProcess/MediaCache/WebMediaCacheManager.cpp
    391396
     397    WebProcess/NetworkInfo/WebNetworkInfoManager.cpp
     398
    392399    WebProcess/Notifications/NotificationPermissionRequestManager.cpp
    393400    WebProcess/Notifications/WebNotificationManager.cpp
    … …  
    422429    WebProcess/WebCoreSupport/WebInspectorClient.cpp
    423430    WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
     431    WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp
    424432    WebProcess/WebCoreSupport/WebNotificationClient.cpp
    425433    WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
    … …  
    468476    UIProcess/WebKeyValueStorageManagerProxy.messages.in
    469477    UIProcess/WebMediaCacheManagerProxy.messages.in
     478    UIProcess/WebNetworkInfoManagerProxy.messages.in
    470479    UIProcess/WebPageProxy.messages.in
    471480    UIProcess/WebProcessProxy.messages.in
    … …  
    497506
    498507    WebProcess/MediaCache/WebMediaCacheManager.messages.in
     508
     509    WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in
    499510
    500511    WebProcess/Notifications/WebNotificationManager.messages.in

  • trunk/Source/WebKit2/ChangeLog

    r121979 r121989  
     12012-07-06  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [WK2] Add support for Network Information API
     4        https://bugs.webkit.org/show_bug.cgi?id=89870
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Add Network Information API support for WebKit2.
     9
     10        * CMakeLists.txt:
     11        * DerivedSources.pri:
     12        * GNUmakefile.am:
     13        * GNUmakefile.list.am:
     14        * Platform/CoreIPC/MessageID.h:
     15        * Shared/API/c/WKBase.h:
     16        * Shared/APIObject.h:
     17        * Shared/WebNetworkInfo.cpp: Added.
     18        (WebKit):
     19        (WebKit::WebNetworkInfo::WebNetworkInfo):
     20        (WebKit::WebNetworkInfo::~WebNetworkInfo):
     21        (WebKit::WebNetworkInfo::Data::encode):
     22        (WebKit::WebNetworkInfo::Data::decode):
     23        * Shared/WebNetworkInfo.h: Added.
     24        (WebKit):
     25        (WebNetworkInfo):
     26        (Data):
     27        (WebKit::WebNetworkInfo::create):
     28        (WebKit::WebNetworkInfo::bandwidth):
     29        (WebKit::WebNetworkInfo::metered):
     30        (WebKit::WebNetworkInfo::data):
     31        (WebKit::WebNetworkInfo::type):
     32        * Target.pri:
     33        * UIProcess/API/C/WKAPICast.h:
     34        (WebKit):
     35        * UIProcess/API/C/WKNetworkInfoManager.cpp: Added.
     36        (WKNetworkInfoManagerGetTypeID):
     37        * UIProcess/API/C/WKNetworkInfoManager.h: Added.
     38        * UIProcess/WebNetworkInfoManagerProxy.cpp: Added.
     39        (WebKit):
     40        (WebKit::WebNetworkInfoManagerProxy::create):
     41        (WebKit::WebNetworkInfoManagerProxy::WebNetworkInfoManagerProxy):
     42        (WebKit::WebNetworkInfoManagerProxy::~WebNetworkInfoManagerProxy):
     43        (WebKit::WebNetworkInfoManagerProxy::invalidate):
     44        (WebKit::WebNetworkInfoManagerProxy::initializeProvider):
     45        (WebKit::WebNetworkInfoManagerProxy::providerDidChangeNetworkInformation):
     46        (WebKit::WebNetworkInfoManagerProxy::didReceiveMessage):
     47        (WebKit::WebNetworkInfoManagerProxy::startUpdating):
     48        (WebKit::WebNetworkInfoManagerProxy::stopUpdating):
     49        (WebKit::WebNetworkInfoManagerProxy::getBandwidth):
     50        (WebKit::WebNetworkInfoManagerProxy::isMetered):
     51        * UIProcess/WebNetworkInfoManagerProxy.h: Added.
     52        (CoreIPC):
     53        (WebKit):
     54        (WebNetworkInfoManagerProxy):
     55        (WebKit::WebNetworkInfoManagerProxy::clearContext):
     56        (WebKit::WebNetworkInfoManagerProxy::type):
     57        * UIProcess/WebNetworkInfoManagerProxy.messages.in: Added.
     58        * UIProcess/WebNetworkInfoProvider.cpp: Added.
     59        (WebKit):
     60        (WebKit::WebNetworkInfoProvider::startUpdating):
     61        (WebKit::WebNetworkInfoProvider::stopUpdating):
     62        (WebKit::WebNetworkInfoProvider::bandwidth):
     63        (WebKit::WebNetworkInfoProvider::metered):
     64        * UIProcess/WebNetworkInfoProvider.h: Added.
     65        (WebKit):
     66        (WebNetworkInfoProvider):
     67        * WebKit2.pri:
     68        * WebProcess/NetworkInfo/WebNetworkInfoManager.cpp: Added.
     69        (WebKit):
     70        (WebKit::WebNetworkInfoManager::WebNetworkInfoManager):
     71        (WebKit::WebNetworkInfoManager::~WebNetworkInfoManager):
     72        (WebKit::WebNetworkInfoManager::didReceiveMessage):
     73        (WebKit::WebNetworkInfoManager::registerWebPage):
     74        (WebKit::WebNetworkInfoManager::unregisterWebPage):
     75        (WebKit::WebNetworkInfoManager::bandwidth):
     76        (WebKit::WebNetworkInfoManager::metered):
     77        (WebKit::WebNetworkInfoManager::didChangeNetworkInformation):
     78        * WebProcess/NetworkInfo/WebNetworkInfoManager.h: Added.
     79        (CoreIPC):
     80        (WebKit):
     81        (WebNetworkInfoManager):
     82        * WebProcess/NetworkInfo/WebNetworkInfoManager.messages.in: Added.
     83        * WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp: Added.
     84        (WebKit):
     85        (WebKit::WebNetworkInfoClient::~WebNetworkInfoClient):
     86        (WebKit::WebNetworkInfoClient::bandwidth):
     87        (WebKit::WebNetworkInfoClient::metered):
     88        (WebKit::WebNetworkInfoClient::startUpdating):
     89        (WebKit::WebNetworkInfoClient::stopUpdating):
     90        * WebProcess/WebCoreSupport/WebNetworkInfoClient.h: Added.
     91        (WebKit):
     92        (WebNetworkInfoClient):
     93        (WebKit::WebNetworkInfoClient::WebNetworkInfoClient):
     94        * WebProcess/WebProcess.cpp:
     95        (WebKit::WebProcess::WebProcess):
     96        (WebKit::WebProcess::didReceiveMessage):
     97        * WebProcess/WebProcess.h:
     98        (WebProcess):
     99        (WebKit::WebProcess::networkInfoManager):
     100
    11012012-07-06  Jessie Berlin  <jberlin@apple.com>
    2102

  • trunk/Source/WebKit2/DerivedSources.pri

    r121808 r121989  
    4646    WebProcess/KeyValueStorage \
    4747    WebProcess/MediaCache \
     48    WebProcess/NetworkInfo \
    4849    WebProcess/Notifications \
    4950    WebProcess/Plugins \
    … …  
    8788    WebMediaCacheManager.messages.in \
    8889    WebMediaCacheManagerProxy.messages.in \
     90    WebNetworkInfoManager.messages.in \
     91    WebNetworkInfoManagerProxy.messages.in \
    8992    WebNotificationManagerProxy.messages.in \
    9093    WebNotificationManager.messages.in \

  • trunk/Source/WebKit2/GNUmakefile.am

    r121808 r121989  
    7575        -I$(srcdir)/Source/WebKit2/WebProcess/Launching \
    7676        -I$(srcdir)/Source/WebKit2/WebProcess/MediaCache \
     77        -I$(srcdir)/Source/WebKit2/WebProcess/NetworkInfo \
    7778        -I$(srcdir)/Source/WebKit2/WebProcess/Notifications \
    7879        -I$(srcdir)/Source/WebKit2/WebProcess/ResourceCache \
    … …  
    220221        $(WebKit2)/WebProcess/KeyValueStorage \
    221222        $(WebKit2)/WebProcess/MediaCache \
     223        $(WebKit2)/WebProcess/NetworkInfo \
    222224        $(WebKit2)/WebProcess/Notifications \
    223225        $(WebKit2)/WebProcess/Plugins \
    … …  
    523525        $(shell ls $(WebKit2)/WebProcess/KeyValueStorage/*.in) \
    524526        $(shell ls $(WebKit2)/WebProcess/MediaCache/*.in) \
     527        $(shell ls $(WebKit2)/WebProcess/NetworkInfo/*.in) \
    525528        $(shell ls $(WebKit2)/WebProcess/Notifications/*.in) \
    526529        $(shell ls $(WebKit2)/WebProcess/Plugins/*.in) \

  • trunk/Source/WebKit2/GNUmakefile.list.am

    r121919 r121989  
    7272        $(WebKit2)/UIProcess/API/C/WKNativeEvent.h \
    7373        $(WebKit2)/UIProcess/API/C/WKNavigationData.h \
     74        $(WebKit2)/UIProcess/API/C/WKNetworkInfoManager.h \
    7475        $(WebKit2)/UIProcess/API/C/WKNotification.h \
    7576        $(WebKit2)/UIProcess/API/C/WKNotificationManager.h \
    … …  
    193194        DerivedSources/WebKit2/WebMediaCacheManagerProxyMessageReceiver.cpp \
    194195        DerivedSources/WebKit2/WebMediaCacheManagerProxyMessages.h \
     196        DerivedSources/WebKit2/WebNetworkInfoManagerMessageReceiver.cpp \
     197        DerivedSources/WebKit2/WebNetworkInfoManagerMessages.h \
     198        DerivedSources/WebKit2/WebNetworkInfoManagerProxyMessageReceiver.cpp \
     199        DerivedSources/WebKit2/WebNetworkInfoManagerProxyMessages.h \
    195200        DerivedSources/WebKit2/WebNotificationManagerMessageReceiver.cpp \
    196201        DerivedSources/WebKit2/WebNotificationManagerMessages.h \
    … …  
    461466        Source/WebKit2/Shared/WebMouseEvent.cpp \
    462467        Source/WebKit2/Shared/WebNavigationDataStore.h \
     468        Source/WebKit2/Shared/WebNetworkInfo.h \
    463469        Source/WebKit2/Shared/WebNumber.h \
    464470        Source/WebKit2/Shared/WebOpenPanelParameters.cpp \
    … …  
    561567        Source/WebKit2/UIProcess/API/C/WKNavigationData.cpp \
    562568        Source/WebKit2/UIProcess/API/C/WKNavigationData.h \
     569        Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.cpp \
     570        Source/WebKit2/UIProcess/API/C/WKNetworkInfoManager.h \
    563571        Source/WebKit2/UIProcess/API/C/WKNotification.cpp \
    564572        Source/WebKit2/UIProcess/API/C/WKNotification.h \
    … …  
    855863        Source/WebKit2/UIProcess/WebNavigationData.cpp \
    856864        Source/WebKit2/UIProcess/WebNavigationData.h \
     865        Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp \
     866        Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h \
     867        Source/WebKit2/UIProcess/WebNetworkInfoProvider.cpp \
     868        Source/WebKit2/UIProcess/WebNetworkInfoProvider.h \
    857869        Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp \
    858870        Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h \
    … …  
    985997        Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp \
    986998        Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h \
     999        Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp \
     1000        Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h \
    9871001        Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp \
    9881002        Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.h \
    … …  
    10581072        Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp \
    10591073        Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.h \
     1074        Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp \
     1075        Source/WebKit2/WebProcess/WebCoreSupport/WebNetworkInfoClient.h \
    10601076        Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp \
    10611077        Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.h \

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

    r121808 r121989  
    5050    MessageClassWebKeyValueStorageManager,
    5151    MessageClassWebMediaCacheManager,
     52    MessageClassWebNetworkInfoManagerProxy,
    5253    MessageClassWebNotificationManager,
    5354    MessageClassWebPage,
    … …  
    7576    MessageClassWebKeyValueStorageManagerProxy,
    7677    MessageClassWebMediaCacheManagerProxy,
     78    MessageClassWebNetworkInfoManager,
    7779    MessageClassWebNotificationManagerProxy,
    7880    MessageClassWebPageProxy,

  • trunk/Source/WebKit2/Shared/API/c/WKBase.h

    r121808 r121989  
    110110typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
    111111typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
     112typedef const struct OpaqueWKNetworkInfoManager* WKNetworkInfoManagerRef;
     113typedef const struct OpaqueWKNetworkInfo* WKNetworkInfoRef;
    112114typedef const struct OpaqueWKNotification* WKNotificationRef;
    113115typedef const struct OpaqueWKNotificationManager* WKNotificationManagerRef;

  • trunk/Source/WebKit2/Shared/APIObject.h

    r121808 r121989  
    9696        TypeMediaCacheManager,
    9797        TypeNavigationData,
     98        TypeNetworkInfo,
     99        TypeNetworkInfoManager,
    98100        TypeNotification,
    99101        TypeNotificationManager,

  • trunk/Source/WebKit2/Target.pri

    r121919 r121989  
    168168    UIProcess/API/C/WKOpenPanelResultListener.h \
    169169    UIProcess/API/C/WKNavigationData.h \
     170    UIProcess/API/C/WKNetworkInfoManager.h \
    170171    UIProcess/API/C/WKNotification.h \
    171172    UIProcess/API/C/WKNotificationManager.h \
    … …  
    337338    WebProcess/KeyValueStorage/WebKeyValueStorageManager.h \
    338339    WebProcess/MediaCache/WebMediaCacheManager.h \
     340    WebProcess/NetworkInfo/WebNetworkInfoManager.h \
    339341    WebProcess/Notifications/NotificationPermissionRequestManager.h \
    340342    WebProcess/Notifications/WebNotificationManager.h \
    … …  
    366368    WebProcess/WebCoreSupport/WebInspectorClient.h \
    367369    WebProcess/WebCoreSupport/WebInspectorFrontendClient.h \
     370    WebProcess/WebCoreSupport/WebNetworkInfoClient.h \
    368371    WebProcess/WebCoreSupport/WebNotificationClient.h \
    369372    WebProcess/WebCoreSupport/WebPlatformStrategies.h \
    … …  
    487490    Shared/WebLayerTreeInfo.cpp \
    488491    Shared/WebMouseEvent.cpp \
     492    Shared/WebNetworkInfo.cpp \
    489493    Shared/WebOpenPanelParameters.cpp \
    490494    Shared/WebPageCreationParameters.cpp \
    … …  
    540544    UIProcess/API/C/WKOpenPanelResultListener.cpp \
    541545    UIProcess/API/C/WKNavigationData.cpp \
     546    UIProcess/API/C/WKNetworkInfoManager.cpp \
    542547    UIProcess/API/C/WKPage.cpp \
    543548    UIProcess/API/C/WKPageGroup.cpp \
    … …  
    629634    UIProcess/WebMediaCacheManagerProxy.cpp \
    630635    UIProcess/WebNavigationData.cpp \
     636    UIProcess/WebNetworkInfoManagerProxy.cpp \
     637    UIProcess/WebNetworkInfoProvider.cpp \
    631638    UIProcess/WebOpenPanelResultListenerProxy.cpp \
    632639    UIProcess/WebPageContextMenuClient.cpp \
    … …  
    712719    WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp \
    713720    WebProcess/MediaCache/WebMediaCacheManager.cpp \
     721    WebProcess/NetworkInfo/WebNetworkInfoManager.cpp \
    714722    WebProcess/Notifications/NotificationPermissionRequestManager.cpp \
    715723    WebProcess/Notifications/WebNotificationManager.cpp \
    … …  
    742750    WebProcess/WebCoreSupport/WebInspectorClient.cpp \
    743751    WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp \
     752    WebProcess/WebCoreSupport/WebNetworkInfoClient.cpp \
    744753    WebProcess/WebCoreSupport/WebNotificationClient.cpp \
    745754    WebProcess/WebCoreSupport/WebPlatformStrategies.cpp \

  • trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

    r121808 r121989  
    7878class WebMediaCacheManagerProxy;
    7979class WebNavigationData;
     80class WebNetworkInfoManagerProxy;
     81class WebNetworkInfo;
    8082class WebNotification;
    8183class WebNotificationProvider;
    … …  
    119121WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
    120122WK_ADD_API_MAPPING(WKNavigationDataRef, WebNavigationData)
     123WK_ADD_API_MAPPING(WKNetworkInfoManagerRef, WebNetworkInfoManagerProxy)
     124WK_ADD_API_MAPPING(WKNetworkInfoRef, WebNetworkInfo)
    121125WK_ADD_API_MAPPING(WKNotificationManagerRef, WebNotificationManagerProxy)
    122126WK_ADD_API_MAPPING(WKNotificationPermissionRequestRef, NotificationPermissionRequest)

  • trunk/Source/WebKit2/WebKit2.pri

    r121808 r121989  
    5151    $$SOURCE_DIR/WebProcess/KeyValueStorage \
    5252    $$SOURCE_DIR/WebProcess/MediaCache \
     53    $$SOURCE_DIR/WebProcess/NetworkInfo \
    5354    $$SOURCE_DIR/WebProcess/Notifications \
    5455    $$SOURCE_DIR/WebProcess/Plugins \

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

    r121808 r121989  
    8181#include <wtf/RandomNumber.h>
    8282
     83#if ENABLE(NETWORK_INFO)
     84#include "WebNetworkInfoManagerMessages.h"
     85#endif
     86
    8387#if !OS(WINDOWS)
    8488#include <unistd.h>
    … …  
    148152#if ENABLE(BATTERY_STATUS)
    149153    , m_batteryManager(this)
     154#endif
     155#if ENABLE(NETWORK_INFO)
     156    , m_networkInfoManager(this)
    150157#endif
    151158#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
    … …  
    640647    if (messageID.is<CoreIPC::MessageClassWebBatteryManager>()) {
    641648        m_batteryManager.didReceiveMessage(connection, messageID, arguments);
     649        return;
     650    }
     651#endif
     652
     653#if ENABLE(NETWORK_INFO)
     654    if (messageID.is<CoreIPC::MessageClassWebNetworkInfoManager>()) {
     655        m_networkInfoManager.didReceiveMessage(connection, messageID, arguments);
    642656        return;
    643657    }

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

    r121808 r121989  
    6262#endif
    6363
     64#if ENABLE(NETWORK_INFO)
     65#include "WebNetworkInfoManager.h"
     66#endif
     67
    6468#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
    6569#include "WebNotificationManager.h"
    … …  
    150154#if ENABLE(BATTERY_STATUS)
    151155    WebBatteryManager& batteryManager() { return m_batteryManager; }
     156#endif
     157
     158#if ENABLE(NETWORK_INFO)
     159    WebNetworkInfoManager& networkInfoManager() { return m_networkInfoManager; }
    152160#endif
    153161   
    … …  
    298306    WebBatteryManager m_batteryManager;
    299307#endif
     308#if ENABLE(NETWORK_INFO)
     309    WebNetworkInfoManager m_networkInfoManager;
     310#endif
    300311#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
    301312    WebNotificationManager m_notificationManager;
Note: See TracChangeset for help on using the changeset viewer.