Changeset 121919 in webkit


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

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

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

Add C API for WKBatteryManager and WKBatteryStatus
so that clients can support the Battery Status API
in WebKit2.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • UIProcess/API/C/WKBatteryManager.cpp:

(WKBatteryManagerProviderDidChangeBatteryStatus):
(WKBatteryManagerProviderUpdateBatteryStatus):

  • UIProcess/API/C/WKBatteryStatus.cpp: Copied from Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp.

(WKBatteryStatusGetTypeID):
(WKBatteryStatusCreate):

  • UIProcess/API/C/WKBatteryStatus.h: Copied from Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp.
Location:
trunk/Source/WebKit2
Files:
6 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/CMakeLists.txt

    r121808 r121919  
    270270    UIProcess/API/C/WKBackForwardListItem.cpp
    271271    UIProcess/API/C/WKBatteryManager.cpp
     272    UIProcess/API/C/WKBatteryStatus.cpp
    272273    UIProcess/API/C/WKContext.cpp
    273274    UIProcess/API/C/WKCookieManager.cpp

  • trunk/Source/WebKit2/ChangeLog

    r121916 r121919  
     12012-07-05  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [WK2] Add C API for Battery Status API
     4        https://bugs.webkit.org/show_bug.cgi?id=90545
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Add C API for WKBatteryManager and WKBatteryStatus
     9        so that clients can support the Battery Status API
     10        in WebKit2.
     11
     12        * CMakeLists.txt:
     13        * GNUmakefile.list.am:
     14        * Target.pri:
     15        * UIProcess/API/C/WKBatteryManager.cpp:
     16        (WKBatteryManagerProviderDidChangeBatteryStatus):
     17        (WKBatteryManagerProviderUpdateBatteryStatus):
     18        * UIProcess/API/C/WKBatteryStatus.cpp: Copied from Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp.
     19        (WKBatteryStatusGetTypeID):
     20        (WKBatteryStatusCreate):
     21        * UIProcess/API/C/WKBatteryStatus.h: Copied from Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp.
     22
    1232012-07-05  Sheriff Bot  <webkit.review.bot@gmail.com>
    224

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

    r121808 r121919  
    4949        $(WebKit2)/UIProcess/API/C/WKBackForwardListItem.h \
    5050        $(WebKit2)/UIProcess/API/C/WKBatteryManager.h \
     51        $(WebKit2)/UIProcess/API/C/WKBatteryStatus.h \
    5152        $(WebKit2)/UIProcess/API/C/WKContext.h \
    5253        $(WebKit2)/UIProcess/API/C/WKContextPrivate.h \
    … …  
    515516        Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp \
    516517        Source/WebKit2/UIProcess/API/C/WKBatteryManager.h \
     518        Source/WebKit2/UIProcess/API/C/WKBatteryStatus.cpp \
     519        Source/WebKit2/UIProcess/API/C/WKBatteryStatus.h \
    517520        Source/WebKit2/UIProcess/API/C/WKContext.cpp \
    518521        Source/WebKit2/UIProcess/API/C/WKContext.h \

  • trunk/Source/WebKit2/Target.pri

    r121808 r121919  
    148148    UIProcess/API/C/WKBackForwardListItem.h \
    149149    UIProcess/API/C/WKBatteryManager.h \
     150    UIProcess/API/C/WKBatteryStatus.h \
    150151    UIProcess/API/C/WKContext.h \
    151152    UIProcess/API/C/WKContextPrivate.h \
    … …  
    518519    UIProcess/API/C/WKBackForwardListItem.cpp \
    519520    UIProcess/API/C/WKBatteryManager.cpp \
     521    UIProcess/API/C/WKBatteryStatus.cpp \
    520522    UIProcess/API/C/WKContext.cpp \
    521523    UIProcess/API/C/WKCredential.cpp \

  • trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp

    r121808 r121919  
    2828
    2929#include "WKAPICast.h"
     30#include <wtf/text/AtomicString.h>
    3031
    3132#if ENABLE(BATTERY_STATUS)
    … …  
    4344#endif
    4445}
     46
     47void WKBatteryManagerSetProvider(WKBatteryManagerRef batteryManager, const WKBatteryProvider* provider)
     48{
     49#if ENABLE(BATTERY_STATUS)
     50    toImpl(batteryManager)->initializeProvider(provider);
     51#endif
     52}
     53
     54void WKBatteryManagerProviderDidChangeBatteryStatus(WKBatteryManagerRef batteryManager, WKStringRef eventType, WKBatteryStatusRef status)
     55{
     56#if ENABLE(BATTERY_STATUS)
     57    toImpl(batteryManager)->providerDidChangeBatteryStatus(AtomicString(toImpl(eventType)->string()), toImpl(status));
     58#endif
     59}
     60
     61void WKBatteryManagerProviderUpdateBatteryStatus(WKBatteryManagerRef batteryManager, WKBatteryStatusRef status)
     62{
     63#if ENABLE(BATTERY_STATUS)
     64    toImpl(batteryManager)->providerUpdateBatteryStatus(toImpl(status));
     65#endif
     66}

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

    r121808 r121919  
    4949WK_EXPORT WKTypeID WKBatteryManagerGetTypeID();
    5050
     51WK_EXPORT void WKBatteryManagerSetProvider(WKBatteryManagerRef batteryManager, const WKBatteryProvider* provider);
     52
     53WK_EXPORT void WKBatteryManagerProviderDidChangeBatteryStatus(WKBatteryManagerRef batteryManager, WKStringRef eventType, WKBatteryStatusRef status);
     54WK_EXPORT void WKBatteryManagerProviderUpdateBatteryStatus(WKBatteryManagerRef batteryManager, WKBatteryStatusRef status);
     55
    5156#ifdef __cplusplus
    5257}

  • trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.cpp

    r121918 r121919  
    2525
    2626#include "config.h"
    27 #include "WKBatteryManager.h"
     27#include "WKBatteryStatus.h"
    2828
    2929#include "WKAPICast.h"
    3030
    3131#if ENABLE(BATTERY_STATUS)
    32 #include "WebBatteryManagerProxy.h"
     32#include "WebBatteryStatus.h"
    3333#endif
    3434
    3535using namespace WebKit;
    3636
    37 WKTypeID WKBatteryManagerGetTypeID()
     37WKTypeID WKBatteryStatusGetTypeID()
    3838{
    3939#if ENABLE(BATTERY_STATUS)
    40     return toAPI(WebBatteryManagerProxy::APIType);
     40    return toAPI(WebBatteryStatus::APIType);
    4141#else
    4242    return 0;
    4343#endif
    4444}
     45
     46WKBatteryStatusRef WKBatteryStatusCreate(bool isCharging, double chargingTime, double dischargingTime, double level)
     47{
     48#if ENABLE(BATTERY_STATUS)
     49    RefPtr<WebBatteryStatus> status = WebBatteryStatus::create(isCharging, chargingTime, dischargingTime, level);
     50    return toAPI(status.release().leakRef());
     51#else
     52    return 0;
     53#endif
     54}
     55

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

    r121918 r121919  
    2424 */
    2525
    26 #include "config.h"
    27 #include "WKBatteryManager.h"
     26#ifndef WKBatteryStatus_h
     27#define WKBatteryStatus_h
    2828
    29 #include "WKAPICast.h"
     29#include <WebKit2/WKBase.h>
    3030
    31 #if ENABLE(BATTERY_STATUS)
    32 #include "WebBatteryManagerProxy.h"
     31#ifdef __cplusplus
     32extern "C" {
    3333#endif
    3434
    35 using namespace WebKit;
     35WK_EXPORT WKTypeID WKBatteryStatusGetTypeID();
    3636
    37 WKTypeID WKBatteryManagerGetTypeID()
    38 {
    39 #if ENABLE(BATTERY_STATUS)
    40     return toAPI(WebBatteryManagerProxy::APIType);
    41 #else
    42     return 0;
     37WK_EXPORT WKBatteryStatusRef WKBatteryStatusCreate(bool isCharging, double chargingTime, double dischargingTime, double level);
     38
     39#ifdef __cplusplus
     40}
    4341#endif
    44 }
     42
     43#endif // WKBatteryStatus_h
Note: See TracChangeset for help on using the changeset viewer.