Changeset 121808 in webkit


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

[WK2] Add support for Battery Status API
https://bugs.webkit.org/show_bug.cgi?id=89558

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

Add support for Battery Status API to WebKit2.

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

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

  • Shared/WebBatteryStatus.h: Added.

(WebKit):
(WebBatteryStatus):
(Data):
(WebKit::WebBatteryStatus::create):
(WebKit::WebBatteryStatus::isCharging):
(WebKit::WebBatteryStatus::chargingTime):
(WebKit::WebBatteryStatus::dischargingTime):
(WebKit::WebBatteryStatus::level):
(WebKit::WebBatteryStatus::data):
(WebKit::WebBatteryStatus::type):

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

(WebKit):

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

(WKBatteryManagerGetTypeID):

  • UIProcess/API/C/WKBatteryManager.h: Added.
  • UIProcess/WebBatteryManagerProxy.cpp: Added.

(WebKit):
(WebKit::WebBatteryManagerProxy::create):
(WebKit::WebBatteryManagerProxy::WebBatteryManagerProxy):
(WebKit::WebBatteryManagerProxy::~WebBatteryManagerProxy):
(WebKit::WebBatteryManagerProxy::invalidate):
(WebKit::WebBatteryManagerProxy::initializeProvider):
(WebKit::WebBatteryManagerProxy::didReceiveMessage):
(WebKit::WebBatteryManagerProxy::startUpdating):
(WebKit::WebBatteryManagerProxy::stopUpdating):
(WebKit::WebBatteryManagerProxy::providerDidChangeBatteryStatus):
(WebKit::WebBatteryManagerProxy::providerUpdateBatteryStatus):

  • UIProcess/WebBatteryManagerProxy.h: Added.

(CoreIPC):
(WebKit):
(WebBatteryManagerProxy):
(WebKit::WebBatteryManagerProxy::clearContext):
(WebKit::WebBatteryManagerProxy::type):

  • UIProcess/WebBatteryManagerProxy.messages.in: Added.
  • UIProcess/WebBatteryProvider.cpp: Added.

(WebKit):
(WebKit::WebBatteryProvider::startUpdating):
(WebKit::WebBatteryProvider::stopUpdating):

  • UIProcess/WebBatteryProvider.h: Added.

(WebKit):
(WebBatteryProvider):

  • WebKit2.pri:
  • WebProcess/Battery/WebBatteryManager.cpp: Added.

(WebKit):
(WebKit::WebBatteryManager::WebBatteryManager):
(WebKit::WebBatteryManager::~WebBatteryManager):
(WebKit::WebBatteryManager::didReceiveMessage):
(WebKit::WebBatteryManager::registerWebPage):
(WebKit::WebBatteryManager::unregisterWebPage):
(WebKit::WebBatteryManager::didChangeBatteryStatus):
(WebKit::WebBatteryManager::updateBatteryStatus):

  • WebProcess/Battery/WebBatteryManager.h: Added.

(CoreIPC):
(WebKit):
(WebBatteryManager):

  • WebProcess/Battery/WebBatteryManager.messages.in: Added.
  • WebProcess/WebCoreSupport/WebBatteryClient.cpp: Added.

(WebKit):
(WebKit::WebBatteryClient::startUpdating):
(WebKit::WebBatteryClient::stopUpdating):
(WebKit::WebBatteryClient::batteryControllerDestroyed):

  • WebProcess/WebCoreSupport/WebBatteryClient.h: Added.

(WebKit):
(WebBatteryClient):
(WebKit::WebBatteryClient::WebBatteryClient):
(WebKit::WebBatteryClient::~WebBatteryClient):

  • WebProcess/WebProcess.cpp:

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

  • WebProcess/WebProcess.h:

(WebProcess):
(WebKit::WebProcess::batteryManager):

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

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/CMakeLists.txt

    r121449 r121808  
    2323    "${WEBKIT2_DIR}/WebProcess/ApplicationCache"
    2424    "${WEBKIT2_DIR}/WebProcess/Authentication"
     25    "${WEBKIT2_DIR}/WebProcess/Battery"
    2526    "${WEBKIT2_DIR}/WebProcess/Cookies"
    2627    "${WEBKIT2_DIR}/WebProcess/Downloads"
     
    138139    Shared/VisitedLinkTable.cpp
    139140    Shared/WebBackForwardListItem.cpp
     141    Shared/WebBatteryStatus.cpp
    140142    Shared/WebConnection.cpp
    141143    Shared/WebConnectionClient.cpp
     
    215217    UIProcess/WebApplicationCacheManagerProxy.cpp
    216218    UIProcess/WebBackForwardList.cpp
     219    UIProcess/WebBatteryManagerProxy.cpp
     220    UIProcess/WebBatteryProvider.cpp
    217221    UIProcess/WebConnectionToWebProcess.cpp
    218222    UIProcess/WebContext.cpp
     
    265269    UIProcess/API/C/WKBackForwardList.cpp
    266270    UIProcess/API/C/WKBackForwardListItem.cpp
     271    UIProcess/API/C/WKBatteryManager.cpp
    267272    UIProcess/API/C/WKContext.cpp
    268273    UIProcess/API/C/WKCookieManager.cpp
     
    330335    WebProcess/Authentication/AuthenticationManager.cpp
    331336
     337    WebProcess/Battery/WebBatteryManager.cpp
     338
    332339    WebProcess/Cookies/WebCookieManager.cpp
    333340
     
    403410    WebProcess/ResourceCache/WebResourceCacheManager.cpp
    404411
     412    WebProcess/WebCoreSupport/WebBatteryClient.cpp
    405413    WebProcess/WebCoreSupport/WebChromeClient.cpp
    406414    WebProcess/WebCoreSupport/WebColorChooser.cpp
     
    449457    UIProcess/LayerTreeCoordinatorProxy.messages.in
    450458    UIProcess/WebApplicationCacheManagerProxy.messages.in
     459    UIProcess/WebBatteryManagerProxy.messages.in
    451460    UIProcess/WebContext.messages.in
    452461    UIProcess/WebCookieManagerProxy.messages.in
     
    474483    WebProcess/Authentication/AuthenticationManager.messages.in
    475484
     485    WebProcess/Battery/WebBatteryManager.messages.in
     486
    476487    WebProcess/Cookies/WebCookieManager.messages.in
    477488
  • trunk/Source/WebKit2/ChangeLog

    r121777 r121808  
     12012-07-03  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [WK2] Add support for Battery Status API
     4        https://bugs.webkit.org/show_bug.cgi?id=89558
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Add support for Battery Status API to 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/WebBatteryStatus.cpp: Added.
     18        (WebKit):
     19        (WebKit::WebBatteryStatus::WebBatteryStatus):
     20        (WebKit::WebBatteryStatus::~WebBatteryStatus):
     21        (WebKit::WebBatteryStatus::Data::encode):
     22        (WebKit::WebBatteryStatus::Data::decode):
     23        * Shared/WebBatteryStatus.h: Added.
     24        (WebKit):
     25        (WebBatteryStatus):
     26        (Data):
     27        (WebKit::WebBatteryStatus::create):
     28        (WebKit::WebBatteryStatus::isCharging):
     29        (WebKit::WebBatteryStatus::chargingTime):
     30        (WebKit::WebBatteryStatus::dischargingTime):
     31        (WebKit::WebBatteryStatus::level):
     32        (WebKit::WebBatteryStatus::data):
     33        (WebKit::WebBatteryStatus::type):
     34        * Target.pri:
     35        * UIProcess/API/C/WKAPICast.h:
     36        (WebKit):
     37        * UIProcess/API/C/WKBatteryManager.cpp: Added.
     38        (WKBatteryManagerGetTypeID):
     39        * UIProcess/API/C/WKBatteryManager.h: Added.
     40        * UIProcess/WebBatteryManagerProxy.cpp: Added.
     41        (WebKit):
     42        (WebKit::WebBatteryManagerProxy::create):
     43        (WebKit::WebBatteryManagerProxy::WebBatteryManagerProxy):
     44        (WebKit::WebBatteryManagerProxy::~WebBatteryManagerProxy):
     45        (WebKit::WebBatteryManagerProxy::invalidate):
     46        (WebKit::WebBatteryManagerProxy::initializeProvider):
     47        (WebKit::WebBatteryManagerProxy::didReceiveMessage):
     48        (WebKit::WebBatteryManagerProxy::startUpdating):
     49        (WebKit::WebBatteryManagerProxy::stopUpdating):
     50        (WebKit::WebBatteryManagerProxy::providerDidChangeBatteryStatus):
     51        (WebKit::WebBatteryManagerProxy::providerUpdateBatteryStatus):
     52        * UIProcess/WebBatteryManagerProxy.h: Added.
     53        (CoreIPC):
     54        (WebKit):
     55        (WebBatteryManagerProxy):
     56        (WebKit::WebBatteryManagerProxy::clearContext):
     57        (WebKit::WebBatteryManagerProxy::type):
     58        * UIProcess/WebBatteryManagerProxy.messages.in: Added.
     59        * UIProcess/WebBatteryProvider.cpp: Added.
     60        (WebKit):
     61        (WebKit::WebBatteryProvider::startUpdating):
     62        (WebKit::WebBatteryProvider::stopUpdating):
     63        * UIProcess/WebBatteryProvider.h: Added.
     64        (WebKit):
     65        (WebBatteryProvider):
     66        * WebKit2.pri:
     67        * WebProcess/Battery/WebBatteryManager.cpp: Added.
     68        (WebKit):
     69        (WebKit::WebBatteryManager::WebBatteryManager):
     70        (WebKit::WebBatteryManager::~WebBatteryManager):
     71        (WebKit::WebBatteryManager::didReceiveMessage):
     72        (WebKit::WebBatteryManager::registerWebPage):
     73        (WebKit::WebBatteryManager::unregisterWebPage):
     74        (WebKit::WebBatteryManager::didChangeBatteryStatus):
     75        (WebKit::WebBatteryManager::updateBatteryStatus):
     76        * WebProcess/Battery/WebBatteryManager.h: Added.
     77        (CoreIPC):
     78        (WebKit):
     79        (WebBatteryManager):
     80        * WebProcess/Battery/WebBatteryManager.messages.in: Added.
     81        * WebProcess/WebCoreSupport/WebBatteryClient.cpp: Added.
     82        (WebKit):
     83        (WebKit::WebBatteryClient::startUpdating):
     84        (WebKit::WebBatteryClient::stopUpdating):
     85        (WebKit::WebBatteryClient::batteryControllerDestroyed):
     86        * WebProcess/WebCoreSupport/WebBatteryClient.h: Added.
     87        (WebKit):
     88        (WebBatteryClient):
     89        (WebKit::WebBatteryClient::WebBatteryClient):
     90        (WebKit::WebBatteryClient::~WebBatteryClient):
     91        * WebProcess/WebProcess.cpp:
     92        (WebKit::WebProcess::WebProcess):
     93        (WebKit::WebProcess::didReceiveMessage):
     94        * WebProcess/WebProcess.h:
     95        (WebProcess):
     96        (WebKit::WebProcess::batteryManager):
     97
    1982012-07-03  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    299
  • trunk/Source/WebKit2/DerivedSources.pri

    r121777 r121808  
    3939    WebProcess/ApplicationCache \
    4040    WebProcess/Authentication \
     41    WebProcess/Battery \
    4142    WebProcess/Cookies \
    4243    WebProcess/FullScreen \
     
    7071    WebApplicationCacheManager.messages.in \
    7172    WebApplicationCacheManagerProxy.messages.in \
     73    WebBatteryManager.messages.in \
     74    WebBatteryManagerProxy.messages.in \
    7275    WebContext.messages.in \
    7376    WebCookieManager.messages.in \
  • trunk/Source/WebKit2/GNUmakefile.am

    r121332 r121808  
    6060        -I$(srcdir)/Source/WebKit2/WebProcess/ApplicationCache \
    6161        -I$(srcdir)/Source/WebKit2/WebProcess/Authentication \
     62        -I$(srcdir)/Source/WebKit2/WebProcess/Battery \
    6263        -I$(srcdir)/Source/WebKit2/WebProcess/Cookies \
    6364        -I$(srcdir)/Source/WebKit2/WebProcess/Downloads \
     
    212213        $(WebKit2)/WebProcess/ApplicationCache \
    213214        $(WebKit2)/WebProcess/Authentication \
     215        $(WebKit2)/WebProcess/Battery \
    214216        $(WebKit2)/WebProcess/Cookies \
    215217        $(WebKit2)/WebProcess/FullScreen \
     
    514516        $(shell ls $(WebKit2)/WebProcess/ApplicationCache/*.in) \
    515517        $(shell ls $(WebKit2)/WebProcess/Authentication/*.in) \
     518        $(shell ls $(WebKit2)/WebProcess/Battery/*.in) \
    516519        $(shell ls $(WebKit2)/WebProcess/Cookies/*.in) \
    517520        $(shell ls $(WebKit2)/WebProcess/FullScreen/*.in) \
  • trunk/Source/WebKit2/GNUmakefile.list.am

    r121449 r121808  
    4848        $(WebKit2)/UIProcess/API/C/WKBackForwardList.h \
    4949        $(WebKit2)/UIProcess/API/C/WKBackForwardListItem.h \
     50        $(WebKit2)/UIProcess/API/C/WKBatteryManager.h \
    5051        $(WebKit2)/UIProcess/API/C/WKContext.h \
    5152        $(WebKit2)/UIProcess/API/C/WKContextPrivate.h \
     
    153154        DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessageReceiver.cpp \
    154155        DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessages.h \
     156        DerivedSources/WebKit2/WebBatteryManagerMessageReceiver.cpp \
     157        DerivedSources/WebKit2/WebBatteryManagerMessages.h \
     158        DerivedSources/WebKit2/WebBatteryManagerProxyMessageReceiver.cpp \
     159        DerivedSources/WebKit2/WebBatteryManagerProxyMessages.h \
    155160        DerivedSources/WebKit2/WebContextMessageReceiver.cpp \
    156161        DerivedSources/WebKit2/WebContextMessages.h \
     
    422427        Source/WebKit2/Shared/WebBackForwardListItem.cpp \
    423428        Source/WebKit2/Shared/WebBackForwardListItem.h \
     429        Source/WebKit2/Shared/WebBatteryStatus.cpp \
     430        Source/WebKit2/Shared/WebBatteryStatus.h \
    424431        Source/WebKit2/Shared/WebCertificateInfo.h \
    425432        Source/WebKit2/Shared/WebConnection.cpp \
     
    506513        Source/WebKit2/UIProcess/API/C/WKBackForwardListItem.cpp \
    507514        Source/WebKit2/UIProcess/API/C/WKBackForwardListItem.h \
     515        Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp \
     516        Source/WebKit2/UIProcess/API/C/WKBatteryManager.h \
    508517        Source/WebKit2/UIProcess/API/C/WKContext.cpp \
    509518        Source/WebKit2/UIProcess/API/C/WKContext.h \
     
    775784        Source/WebKit2/UIProcess/WebBackForwardList.cpp \
    776785        Source/WebKit2/UIProcess/WebBackForwardList.h \
     786        Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp \
     787        Source/WebKit2/UIProcess/WebBatteryManagerProxy.h \
     788        Source/WebKit2/UIProcess/WebBatteryProvider.cpp \
     789        Source/WebKit2/UIProcess/WebBatteryProvider.h \
    777790        Source/WebKit2/UIProcess/WebColorChooserProxy.h \
    778791        Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp \
     
    869882        Source/WebKit2/WebProcess/Authentication/AuthenticationManager.cpp \
    870883        Source/WebKit2/WebProcess/Authentication/AuthenticationManager.h \
     884        Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp \
     885        Source/WebKit2/WebProcess/Battery/WebBatteryManager.h \
    871886        Source/WebKit2/WebProcess/Cookies/WebCookieManager.h \
    872887        Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp \
     
    10171032        Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h \
    10181033        Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h \
     1034        Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp \
     1035        Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.h \
    10191036        Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
    10201037        Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
  • trunk/Source/WebKit2/Platform/CoreIPC/MessageID.h

    r121221 r121808  
    4141    MessageClassLayerTreeCoordinator,
    4242    MessageClassWebApplicationCacheManager,
     43    MessageClassWebBatteryManagerProxy,
    4344    MessageClassWebCookieManager,
    4445    MessageClassWebDatabaseManager,
     
    6364    MessageClassLayerTreeCoordinatorProxy,
    6465    MessageClassWebApplicationCacheManagerProxy,
     66    MessageClassWebBatteryManager,
    6567    MessageClassWebContext,
    6668    MessageClassWebContextLegacy,
  • trunk/Source/WebKit2/Shared/API/c/WKBase.h

    r120925 r121808  
    8787typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
    8888typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
     89typedef const struct OpaqueWKBatteryManager* WKBatteryManagerRef;
     90typedef const struct OpaqueWKBatteryStatus* WKBatteryStatusRef;
    8991typedef const struct OpaqueWKResourceCacheManager* WKResourceCacheManagerRef;
    9092typedef const struct OpaqueWKContext* WKContextRef;
  • trunk/Source/WebKit2/Shared/APIObject.h

    r120301 r121808  
    7373        TypeBackForwardList,
    7474        TypeBackForwardListItem,
     75        TypeBatteryManager,
     76        TypeBatteryStatus,
    7577        TypeCacheManager,
    7678        TypeContext,
  • trunk/Source/WebKit2/Target.pri

    r121777 r121808  
    9898    Shared/WebCoreArgumentCoders.h \
    9999    Shared/WebBackForwardListItem.h \
     100    Shared/WebBatteryStatus.h \
    100101    Shared/WebCertificateInfo.h \
    101102    Shared/WebConnection.h \
     
    146147    UIProcess/API/C/WKBackForwardList.h \
    147148    UIProcess/API/C/WKBackForwardListItem.h \
     149    UIProcess/API/C/WKBatteryManager.h \
    148150    UIProcess/API/C/WKContext.h \
    149151    UIProcess/API/C/WKContextPrivate.h \
     
    232234    UIProcess/WebApplicationCacheManagerProxy.h \
    233235    UIProcess/WebBackForwardList.h \
     236    UIProcess/WebBatteryManagerProxy.h \
     237    UIProcess/WebBatteryProvider.h \
    234238    UIProcess/WebColorChooserProxy.h \
    235239    UIProcess/WebConnectionToWebProcess.h \
     
    298302    WebProcess/ApplicationCache/WebApplicationCacheManager.h \
    299303    WebProcess/Authentication/AuthenticationManager.h \
     304    WebProcess/Battery/WebBatteryManager.h \
    300305    WebProcess/Cookies/WebCookieManager.h \
    301306    WebProcess/Downloads/Download.h \
     
    348353    WebProcess/Plugins/PluginProcessConnection.h \
    349354    WebProcess/Plugins/PluginProcessConnectionManager.h \
     355    WebProcess/WebCoreSupport/WebBatteryClient.h \
    350356    WebProcess/WebCoreSupport/WebChromeClient.h \
    351357    WebProcess/WebCoreSupport/WebColorChooser.h \
     
    463469    Shared/VisitedLinkTable.cpp \
    464470    Shared/WebBackForwardListItem.cpp \
     471    Shared/WebBatteryStatus.cpp \
    465472    Shared/WebConnection.cpp \
    466473    Shared/WebConnectionClient.cpp \
     
    510517    UIProcess/API/C/WKBackForwardList.cpp \
    511518    UIProcess/API/C/WKBackForwardListItem.cpp \
     519    UIProcess/API/C/WKBatteryManager.cpp \
    512520    UIProcess/API/C/WKContext.cpp \
    513521    UIProcess/API/C/WKCredential.cpp \
     
    586594    UIProcess/WebApplicationCacheManagerProxy.cpp \
    587595    UIProcess/WebBackForwardList.cpp \
     596    UIProcess/WebBatteryManagerProxy.cpp \
     597    UIProcess/WebBatteryProvider.cpp \
    588598    UIProcess/WebConnectionToWebProcess.cpp \
    589599    UIProcess/WebContext.cpp \
     
    655665    WebProcess/ApplicationCache/WebApplicationCacheManager.cpp \
    656666    WebProcess/Authentication/AuthenticationManager.cpp \
     667    WebProcess/Battery/WebBatteryManager.cpp \
    657668    WebProcess/Cookies/WebCookieManager.cpp \
    658669    WebProcess/Cookies/qt/WebCookieManagerQt.cpp \
     
    718729    WebProcess/Plugins/PluginProcessConnection.cpp \
    719730    WebProcess/Plugins/PluginProcessConnectionManager.cpp \
     731    WebProcess/WebCoreSupport/WebBatteryClient.cpp \
    720732    WebProcess/WebCoreSupport/WebChromeClient.cpp \
    721733    WebProcess/WebCoreSupport/WebColorChooser.cpp \
  • trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

    r120925 r121808  
    5757class WebBackForwardList;
    5858class WebBackForwardListItem;
     59class WebBatteryManagerProxy;
     60class WebBatteryStatus;
    5961class WebResourceCacheManagerProxy;
    6062class WebContext;
     
    9597WK_ADD_API_MAPPING(WKBackForwardListItemRef, WebBackForwardListItem)
    9698WK_ADD_API_MAPPING(WKBackForwardListRef, WebBackForwardList)
     99WK_ADD_API_MAPPING(WKBatteryManagerRef, WebBatteryManagerProxy)
     100WK_ADD_API_MAPPING(WKBatteryStatusRef, WebBatteryStatus)
    97101WK_ADD_API_MAPPING(WKResourceCacheManagerRef, WebResourceCacheManagerProxy)
    98102WK_ADD_API_MAPPING(WKContextRef, WebContext)
  • trunk/Source/WebKit2/WebKit2.pri

    r121228 r121808  
    3838    $$SOURCE_DIR/WebProcess/ApplicationCache \
    3939    $$SOURCE_DIR/WebProcess/Authentication \
     40    $$SOURCE_DIR/WebProcess/Battery \
    4041    $$SOURCE_DIR/WebProcess/Cookies \
    4142    $$SOURCE_DIR/WebProcess/Cookies/qt \
  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r121707 r121808  
    146146    , m_textCheckerState()
    147147    , m_geolocationManager(this)
     148#if ENABLE(BATTERY_STATUS)
     149    , m_batteryManager(this)
     150#endif
    148151#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
    149152    , m_notificationManager(this)
     
    633636        return;
    634637    }
     638
     639#if ENABLE(BATTERY_STATUS)
     640    if (messageID.is<CoreIPC::MessageClassWebBatteryManager>()) {
     641        m_batteryManager.didReceiveMessage(connection, messageID, arguments);
     642        return;
     643    }
     644#endif
    635645
    636646    if (messageID.is<CoreIPC::MessageClassWebIconDatabaseProxy>()) {
  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r119349 r121808  
    5858#endif
    5959
     60#if ENABLE(BATTERY_STATUS)
     61#include "WebBatteryManager.h"
     62#endif
     63
    6064#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
    6165#include "WebNotificationManager.h"
     
    143147    // Geolocation
    144148    WebGeolocationManager& geolocationManager() { return m_geolocationManager; }
     149
     150#if ENABLE(BATTERY_STATUS)
     151    WebBatteryManager& batteryManager() { return m_batteryManager; }
     152#endif
    145153   
    146154#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     
    287295    TextCheckerState m_textCheckerState;
    288296    WebGeolocationManager m_geolocationManager;
     297#if ENABLE(BATTERY_STATUS)
     298    WebBatteryManager m_batteryManager;
     299#endif
    289300#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
    290301    WebNotificationManager m_notificationManager;
Note: See TracChangeset for help on using the changeset viewer.