Changeset 110991 in webkit


Ignore:
Timestamp:
Mar 16, 2012 5:23:07 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

.: Support for Battery Status API.
​https://bugs.webkit.org/show_bug.cgi?id=62698

Enable BATTERY_STATUS for WebKit-Efl.
​http://www.w3.org/TR/battery-status/

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-03-16
Reviewed by Adam Barth.

  • Source/cmake/OptionsEfl.cmake:
  • Source/cmakeconfig.h.cmake:

Source/WebCore: Support for Battery Status API
​https://bugs.webkit.org/show_bug.cgi?id=62698

Battery Status API is implemented under the Navigator class.
Battery Status API has four types of events, and all events are operated based on a callback mechanism.

: onchargingchange, onchargingtimechange, ondischargingtimechange, onlevelchange.

The battery status can be accessed using BatteryManager(navigator.webkitBattery), and battery status is controlled by BatteryController which manages instances of BatteryManager.
When battery status event is raised, BatteryController calls all registered BatteryManager's event dispatcher.
​http://www.w3.org/TR/battery-status/

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-03-16
Reviewed by Adam Barth.

Tests: batterystatus/add-listener-from-callback.html

batterystatus/basic-all-types-of-events.html
batterystatus/basic-operation.html
batterystatus/event-after-navigation.html
batterystatus/multiple-frames.html
batterystatus/updates.html
batterystatus/window-property.html

  • CMakeLists.txt:
  • Modules/battery/BatteryClient.h: Added.

(WebCore):
(BatteryClient):
(WebCore::BatteryClient::~BatteryClient):

  • Modules/battery/BatteryController.cpp: Added.

(WebCore):
(WebCore::BatteryController::BatteryController):
(WebCore::BatteryController::~BatteryController):
(WebCore::BatteryController::create):
(WebCore::BatteryController::addListener):
(WebCore::BatteryController::removeListener):
(WebCore::BatteryController::didChangeBatteryStatus):
(WebCore::BatteryController::supplementName):
(WebCore::BatteryController::isActive):
(WebCore::provideBatteryTo):

  • Modules/battery/BatteryController.h: Added.

(WebCore):
(BatteryController):
(WebCore::BatteryController::client):
(WebCore::BatteryController::from):

  • Modules/battery/BatteryManager.cpp: Added.

(WebCore):
(WebCore::BatteryManager::create):
(WebCore::BatteryManager::~BatteryManager):
(WebCore::BatteryManager::BatteryManager):
(WebCore::BatteryManager::charging):
(WebCore::BatteryManager::chargingTime):
(WebCore::BatteryManager::dischargingTime):
(WebCore::BatteryManager::level):
(WebCore::BatteryManager::didChangeBatteryStatus):
(WebCore::BatteryManager::suspend):
(WebCore::BatteryManager::resume):
(WebCore::BatteryManager::stop):

  • Modules/battery/BatteryManager.h: Added.

(WebCore):
(BatteryManager):
(WebCore::BatteryManager::interfaceName):
(WebCore::BatteryManager::scriptExecutionContext):
(WebCore::BatteryManager::batteryControllerDestroyed):
(WebCore::BatteryManager::canSuspend):
(WebCore::BatteryManager::eventTargetData):
(WebCore::BatteryManager::ensureEventTargetData):
(WebCore::BatteryManager::refEventTarget):
(WebCore::BatteryManager::derefEventTarget):

  • Modules/battery/BatteryManager.idl: Added.
  • Modules/battery/BatteryStatus.cpp: Added.

(WebCore):
(WebCore::BatteryStatus::create):
(WebCore::BatteryStatus::BatteryStatus):

  • Modules/battery/BatteryStatus.h: Added.

(WebCore):
(BatteryStatus):
(WebCore::BatteryStatus::charging):
(WebCore::BatteryStatus::chargingTime):
(WebCore::BatteryStatus::dischargingTime):
(WebCore::BatteryStatus::level):

  • Modules/battery/NavigatorBattery.cpp: Added.

(WebCore):
(WebCore::NavigatorBattery::NavigatorBattery):
(WebCore::NavigatorBattery::~NavigatorBattery):
(WebCore::NavigatorBattery::webkitBattery):
(WebCore::NavigatorBattery::from):
(WebCore::NavigatorBattery::batteryManager):

  • Modules/battery/NavigatorBattery.h: Added.

(WebCore):
(NavigatorBattery):

  • Modules/battery/NavigatorBattery.idl: Added.
  • dom/EventNames.h:

(WebCore):

  • dom/EventTargetFactory.in:
  • testing/Internals.cpp:

(WebCore::Internals::setBatteryStatus):
(WebCore):

  • testing/Internals.h:

(Internals):

  • testing/Internals.idl:

Source/WebKit: Support for Battery Status API
​https://bugs.webkit.org/show_bug.cgi?id=62698

Add include directory and file.
​http://www.w3.org/TR/battery-status/

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-03-16
Reviewed by Adam Barth.

  • PlatformEfl.cmake:

Source/WebKit/efl: Support for Battery Status API
​https://bugs.webkit.org/show_bug.cgi?id=62698

Add BatteryClientEfl class implementation for the layout tests now.
BatteryClientEfl class is not fully implemented in this patch.
(It will be completed by other patch as necessary in the Efl port.)
​http://www.w3.org/TR/battery-status/

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-03-16
Reviewed by Adam Barth.

  • WebCoreSupport/BatteryClientEfl.cpp: Added.

(WebCore):
(WebCore::BatteryClientEfl::BatteryClientEfl):
(WebCore::BatteryClientEfl::setController):
(WebCore::BatteryClientEfl::startUpdating):
(WebCore::BatteryClientEfl::stopUpdating):
(WebCore::BatteryClientEfl::batteryControllerDestroyed):
(WebCore::BatteryClientEfl::setBatteryStatus):

  • WebCoreSupport/BatteryClientEfl.h: Added.

(WebCore):
(BatteryClientEfl):
(WebCore::BatteryClientEfl::~BatteryClientEfl):

  • ewk/ewk_view.cpp:

(_Ewk_View_Private_Data):
(_ewk_view_priv_new):

Tools: Support for Battery Status API
​https://bugs.webkit.org/show_bug.cgi?id=62698

Add include directory and file.
​http://www.w3.org/TR/battery-status/

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-03-16
Reviewed by Adam Barth.

  • Scripts/build-webkit:

LayoutTests: Support for Battery Status API.
​https://bugs.webkit.org/show_bug.cgi?id=62698

Add new test cases for Battery Status API.
​http://www.w3.org/TR/battery-status/

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-03-16
Reviewed by Adam Barth.

  • batterystatus/add-listener-from-callback-expected.txt: Added.
  • batterystatus/add-listener-from-callback.html: Added.
  • batterystatus/basic-all-types-of-events-expected.txt: Added.
  • batterystatus/basic-all-types-of-events.html: Added.
  • batterystatus/basic-operation-expected.txt: Added.
  • batterystatus/basic-operation.html: Added.
  • batterystatus/event-after-navigation-expected.txt: Added.
  • batterystatus/event-after-navigation.html: Added.
  • batterystatus/multiple-frames-expected.txt: Added.
  • batterystatus/multiple-frames.html: Added.
  • batterystatus/resources/event-after-navigation-new.html: Added.
  • batterystatus/script-tests/add-listener-from-callback.js: Added.

(checkBatteryStatus):
(firstListener):
(secondListener):
(maybeFinishTest):

  • batterystatus/script-tests/basic-all-types-of-events.js: Added.

(checkBatteryStatus):
(battery):

  • batterystatus/script-tests/basic-operation.js: Added.
  • batterystatus/script-tests/event-after-navigation.js: Added.
  • batterystatus/script-tests/multiple-frames.js: Added.

(checkBatteryStatus):
(checkChildBatteryStatus):
(mainFrameListener):
(childFrameListener):
(maybeFinishTest):

  • batterystatus/script-tests/updates.js: Added.

(checkBatteryStatus):
(setBatteryStatus):
(firstListener):
(updateListener):

  • batterystatus/script-tests/window-property.js: Added.

(hasOnBatteryProperty):

  • batterystatus/updates-expected.txt: Added.
  • batterystatus/updates.html: Added.
  • batterystatus/window-property-expected.txt: Added.
  • batterystatus/window-property.html: Added.
  • platform/chromium/test_expectations.txt:
  • platform/gtk/Skipped:
  • platform/qt/Skipped:
  • platform/win/Skipped:
  • platform/wincairo/Skipped:
Location:
trunk
Files:
39 added
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r110896 r110991  
     12012-03-16  Kihong Kwon  <kihong.kwon@samsung.com>
     2
     3        Support for Battery Status API.
     4        https://bugs.webkit.org/show_bug.cgi?id=62698
     5
     6        Enable BATTERY_STATUS for WebKit-Efl.
     7        http://www.w3.org/TR/battery-status/
     8
     9        Reviewed by Adam Barth.
     10
     11        * Source/cmake/OptionsEfl.cmake:
     12        * Source/cmakeconfig.h.cmake:
     13
    1142012-03-15  Patrick Gansterer  <paroga@webkit.org>
    215

  • trunk/LayoutTests/ChangeLog

    r110977 r110991  
     12012-03-16  Kihong Kwon  <kihong.kwon@samsung.com>
     2
     3        Support for Battery Status API.
     4        https://bugs.webkit.org/show_bug.cgi?id=62698
     5
     6        Add new test cases for Battery Status API.
     7        http://www.w3.org/TR/battery-status/
     8
     9        Reviewed by Adam Barth.
     10
     11        * batterystatus/add-listener-from-callback-expected.txt: Added.
     12        * batterystatus/add-listener-from-callback.html: Added.
     13        * batterystatus/basic-all-types-of-events-expected.txt: Added.
     14        * batterystatus/basic-all-types-of-events.html: Added.
     15        * batterystatus/basic-operation-expected.txt: Added.
     16        * batterystatus/basic-operation.html: Added.
     17        * batterystatus/event-after-navigation-expected.txt: Added.
     18        * batterystatus/event-after-navigation.html: Added.
     19        * batterystatus/multiple-frames-expected.txt: Added.
     20        * batterystatus/multiple-frames.html: Added.
     21        * batterystatus/resources/event-after-navigation-new.html: Added.
     22        * batterystatus/script-tests/add-listener-from-callback.js: Added.
     23        (checkBatteryStatus):
     24        (firstListener):
     25        (secondListener):
     26        (maybeFinishTest):
     27        * batterystatus/script-tests/basic-all-types-of-events.js: Added.
     28        (checkBatteryStatus):
     29        (battery):
     30        * batterystatus/script-tests/basic-operation.js: Added.
     31        * batterystatus/script-tests/event-after-navigation.js: Added.
     32        * batterystatus/script-tests/multiple-frames.js: Added.
     33        (checkBatteryStatus):
     34        (checkChildBatteryStatus):
     35        (mainFrameListener):
     36        (childFrameListener):
     37        (maybeFinishTest):
     38        * batterystatus/script-tests/updates.js: Added.
     39        (checkBatteryStatus):
     40        (setBatteryStatus):
     41        (firstListener):
     42        (updateListener):
     43        * batterystatus/script-tests/window-property.js: Added.
     44        (hasOnBatteryProperty):
     45        * batterystatus/updates-expected.txt: Added.
     46        * batterystatus/updates.html: Added.
     47        * batterystatus/window-property-expected.txt: Added.
     48        * batterystatus/window-property.html: Added.
     49        * platform/chromium/test_expectations.txt:
     50        * platform/gtk/Skipped:
     51        * platform/qt/Skipped:
     52        * platform/win/Skipped:
     53        * platform/wincairo/Skipped:
     54
    1552012-03-16  Hajime Morrita  <morrita@chromium.org>
    256

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r110977 r110991  
    113113// Vibration API is not supported yet in the chromium port.
    114114BUGWK72010 SKIP : fast/dom/navigator-vibration.html = FAIL
     115
     116// Battery Status API is not supported yet in the chromium port.
     117BUGWK62698 SKIP : batterystatus = PASS FAIL
    115118
    116119// -----------------------------------------------------------------

  • trunk/LayoutTests/platform/gtk/Skipped

    r110974 r110991  
    402402# Pointer Lock is not implemented.
    403403pointer-lock/
     404
     405#Battery Status API support not yet. http://webkit.org/b/62698
     406batterystatus
    404407
    405408###############################################################################

  • trunk/LayoutTests/platform/mac/Skipped

    r110939 r110991  
    584584canvas/philip/tests/2d.shadow.canvas.transparent.2.html
    585585canvas/philip/tests/2d.shadow.image.transparent.2.html
     586
     587# https://bugs.webkit.org/show_bug.cgi?id=62698
     588# Needs BatteryClient implementation.
     589batterystatus/

  • trunk/LayoutTests/platform/qt/Skipped

    r110947 r110991  
    362362#Vibration API is not implemented.
    363363fast/dom/navigator-vibration.html
     364
     365#Battery Status API is not implemented.
     366batterystatus
    364367
    365368# =========================================================================== #

  • trunk/LayoutTests/platform/win/Skipped

    r110939 r110991  
    16611661#Vibration API is not implemented.
    16621662fast/dom/navigator-vibration.html
     1663
     1664#Battery Status API is not implemented.
     1665batterystatus
    16631666
    16641667# Those tests need a text baseline after lazily allocating layers.

  • trunk/LayoutTests/platform/wincairo/Skipped

    r110939 r110991  
    20592059#Vibration API is not implemented.
    20602060fast/dom/navigator-vibration.html
     2061
     2062#Battery Status API is not implemented.
     2063batterystatus

  • trunk/Source/WebCore/CMakeLists.txt

    r110957 r110991  
    23352335)
    23362336
     2337IF (ENABLE_BATTERY_STATUS)
     2338    LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     2339        "${WEBCORE_DIR}/Modules/battery"
     2340    )
     2341    LIST(APPEND WebCore_IDL_FILES
     2342        Modules/battery/NavigatorBattery.idl
     2343        Modules/battery/BatteryManager.idl
     2344    )
     2345    LIST(APPEND WebCore_SOURCES
     2346        Modules/battery/NavigatorBattery.cpp
     2347        Modules/battery/BatteryController.cpp
     2348        Modules/battery/BatteryManager.cpp
     2349        Modules/battery/BatteryStatus.cpp
     2350    )
     2351ENDIF ()
     2352
    23372353# Modules that the bindings generator scripts may use
    23382354SET(SCRIPTS_RESOLVE_SUPPLEMENTAL

  • trunk/Source/WebCore/ChangeLog

    r110989 r110991  
     12012-03-16  Kihong Kwon  <kihong.kwon@samsung.com>
     2
     3        Support for Battery Status API
     4        https://bugs.webkit.org/show_bug.cgi?id=62698
     5
     6        Battery Status API is implemented under the Navigator class.
     7        Battery Status API has four types of events, and all events are operated based on a callback mechanism.
     8         : onchargingchange, onchargingtimechange, ondischargingtimechange, onlevelchange.
     9        The battery status can be accessed using BatteryManager(navigator.webkitBattery), and battery status is controlled by BatteryController which manages instances of BatteryManager.
     10        When battery status event is raised, BatteryController calls all registered BatteryManager's event dispatcher.
     11        http://www.w3.org/TR/battery-status/
     12
     13        Reviewed by Adam Barth.
     14
     15        Tests: batterystatus/add-listener-from-callback.html
     16               batterystatus/basic-all-types-of-events.html
     17               batterystatus/basic-operation.html
     18               batterystatus/event-after-navigation.html
     19               batterystatus/multiple-frames.html
     20               batterystatus/updates.html
     21               batterystatus/window-property.html
     22
     23        * CMakeLists.txt:
     24        * Modules/battery/BatteryClient.h: Added.
     25        (WebCore):
     26        (BatteryClient):
     27        (WebCore::BatteryClient::~BatteryClient):
     28        * Modules/battery/BatteryController.cpp: Added.
     29        (WebCore):
     30        (WebCore::BatteryController::BatteryController):
     31        (WebCore::BatteryController::~BatteryController):
     32        (WebCore::BatteryController::create):
     33        (WebCore::BatteryController::addListener):
     34        (WebCore::BatteryController::removeListener):
     35        (WebCore::BatteryController::didChangeBatteryStatus):
     36        (WebCore::BatteryController::supplementName):
     37        (WebCore::BatteryController::isActive):
     38        (WebCore::provideBatteryTo):
     39        * Modules/battery/BatteryController.h: Added.
     40        (WebCore):
     41        (BatteryController):
     42        (WebCore::BatteryController::client):
     43        (WebCore::BatteryController::from):
     44        * Modules/battery/BatteryManager.cpp: Added.
     45        (WebCore):
     46        (WebCore::BatteryManager::create):
     47        (WebCore::BatteryManager::~BatteryManager):
     48        (WebCore::BatteryManager::BatteryManager):
     49        (WebCore::BatteryManager::charging):
     50        (WebCore::BatteryManager::chargingTime):
     51        (WebCore::BatteryManager::dischargingTime):
     52        (WebCore::BatteryManager::level):
     53        (WebCore::BatteryManager::didChangeBatteryStatus):
     54        (WebCore::BatteryManager::suspend):
     55        (WebCore::BatteryManager::resume):
     56        (WebCore::BatteryManager::stop):
     57        * Modules/battery/BatteryManager.h: Added.
     58        (WebCore):
     59        (BatteryManager):
     60        (WebCore::BatteryManager::interfaceName):
     61        (WebCore::BatteryManager::scriptExecutionContext):
     62        (WebCore::BatteryManager::batteryControllerDestroyed):
     63        (WebCore::BatteryManager::canSuspend):
     64        (WebCore::BatteryManager::eventTargetData):
     65        (WebCore::BatteryManager::ensureEventTargetData):
     66        (WebCore::BatteryManager::refEventTarget):
     67        (WebCore::BatteryManager::derefEventTarget):
     68        * Modules/battery/BatteryManager.idl: Added.
     69        * Modules/battery/BatteryStatus.cpp: Added.
     70        (WebCore):
     71        (WebCore::BatteryStatus::create):
     72        (WebCore::BatteryStatus::BatteryStatus):
     73        * Modules/battery/BatteryStatus.h: Added.
     74        (WebCore):
     75        (BatteryStatus):
     76        (WebCore::BatteryStatus::charging):
     77        (WebCore::BatteryStatus::chargingTime):
     78        (WebCore::BatteryStatus::dischargingTime):
     79        (WebCore::BatteryStatus::level):
     80        * Modules/battery/NavigatorBattery.cpp: Added.
     81        (WebCore):
     82        (WebCore::NavigatorBattery::NavigatorBattery):
     83        (WebCore::NavigatorBattery::~NavigatorBattery):
     84        (WebCore::NavigatorBattery::webkitBattery):
     85        (WebCore::NavigatorBattery::from):
     86        (WebCore::NavigatorBattery::batteryManager):
     87        * Modules/battery/NavigatorBattery.h: Added.
     88        (WebCore):
     89        (NavigatorBattery):
     90        * Modules/battery/NavigatorBattery.idl: Added.
     91        * dom/EventNames.h:
     92        (WebCore):
     93        * dom/EventTargetFactory.in:
     94        * testing/Internals.cpp:
     95        (WebCore::Internals::setBatteryStatus):
     96        (WebCore):
     97        * testing/Internals.h:
     98        (Internals):
     99        * testing/Internals.idl:
     100
    11012012-03-16  Ilya Tikhonovsky  <loislo@chromium.org>
    2102

  • trunk/Source/WebCore/dom/EventNames.h

    r110731 r110991  
    4242    macro(cached) \
    4343    macro(change) \
     44    macro(chargingchange) \
     45    macro(chargingtimechange) \
    4446    macro(checking) \
    4547    macro(click) \
    … …  
    5658    macro(devicemotion) \
    5759    macro(deviceorientation) \
     60    macro(dischargingtimechange) \
    5861    macro(display) \
    5962    macro(downloading) \
    … …  
    7578    macro(keypress) \
    7679    macro(keyup) \
     80    macro(levelchange) \
    7781    macro(load) \
    7882    macro(loadstart) \

  • trunk/Source/WebCore/dom/EventTargetFactory.in

    r110950 r110991  
    22
    33AudioContext conditional=WEB_AUDIO
     4BatteryManager conditional=BATTERY_STATUS
    45DedicatedWorkerContext conditional=WORKERS
    56DOMApplicationCache

  • trunk/Source/WebCore/testing/Internals.cpp

    r110706 r110991  
    6868#endif
    6969
     70#if ENABLE(BATTERY_STATUS)
     71#include "BatteryController.h"
     72#endif
     73
    7074namespace WebCore {
    7175
    … …  
    715719}
    716720
    717 }
     721void Internals::setBatteryStatus(Document* document, const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode& ec)
     722{
     723    if (!document || !document->page()) {
     724        ec = INVALID_ACCESS_ERR;
     725        return;
     726    }
     727
     728#if ENABLE(BATTERY_STATUS)
     729    BatteryController::from(document->page())->didChangeBatteryStatus(eventType, BatteryStatus::create(charging, chargingTime, dischargingTime, level));
     730#else
     731    UNUSED_PARAM(eventType);
     732    UNUSED_PARAM(charging);
     733    UNUSED_PARAM(chargingTime);
     734    UNUSED_PARAM(dischargingTime);
     735    UNUSED_PARAM(level);
     736#endif
     737}
     738
     739}

  • trunk/Source/WebCore/testing/Internals.h

    r110706 r110991  
    137137    InternalSettings* settings() const { return m_settings.get(); }
    138138
     139    void setBatteryStatus(Document*, const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode&);
     140
    139141private:
    140142    explicit Internals(Document*);

  • trunk/Source/WebCore/testing/Internals.idl

    r110706 r110991  
    111111
    112112        readonly attribute InternalSettings settings;
     113
     114#if defined(ENABLE_BATTERY_STATUS) && ENABLE_BATTERY_STATUS
     115        void setBatteryStatus(in Document document, in DOMString eventType, in boolean charging, in double chargingTime, in double dischargingTime, in double level) raises (DOMException);
     116#endif
    113117    };
    114118}

  • trunk/Source/WebKit/ChangeLog

    r110403 r110991  
     12012-03-16  Kihong Kwon  <kihong.kwon@samsung.com>
     2
     3        Support for Battery Status API
     4        https://bugs.webkit.org/show_bug.cgi?id=62698
     5
     6        Add include directory and file.
     7        http://www.w3.org/TR/battery-status/
     8
     9        Reviewed by Adam Barth.
     10
     11        * PlatformEfl.cmake:
     12
    1132012-03-11  Timothy Hatcher  <timothy@apple.com>
    214

  • trunk/Source/WebKit/PlatformEfl.cmake

    r108806 r110991  
    127127ENDIF ()
    128128
     129IF (ENABLE_BATTERY_STATUS)
     130    LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${WEBCORE_DIR}/Modules/battery)
     131    LIST(APPEND WebKit_SOURCES efl/WebCoreSupport/BatteryClientEfl.cpp)
     132ENDIF ()
    129133
    130134SET(WebKit_THEME_DEFINITION "")

  • trunk/Source/WebKit/efl/ChangeLog

    r110784 r110991  
     12012-03-16  Kihong Kwon  <kihong.kwon@samsung.com>
     2
     3        Support for Battery Status API
     4        https://bugs.webkit.org/show_bug.cgi?id=62698
     5
     6        Add BatteryClientEfl class implementation for the layout tests now.
     7        BatteryClientEfl class is not fully implemented in this patch.
     8        (It will be completed by other patch as necessary in the Efl port.)
     9        http://www.w3.org/TR/battery-status/
     10
     11        Reviewed by Adam Barth.
     12
     13        * WebCoreSupport/BatteryClientEfl.cpp: Added.
     14        (WebCore):
     15        (WebCore::BatteryClientEfl::BatteryClientEfl):
     16        (WebCore::BatteryClientEfl::setController):
     17        (WebCore::BatteryClientEfl::startUpdating):
     18        (WebCore::BatteryClientEfl::stopUpdating):
     19        (WebCore::BatteryClientEfl::batteryControllerDestroyed):
     20        (WebCore::BatteryClientEfl::setBatteryStatus):
     21        * WebCoreSupport/BatteryClientEfl.h: Added.
     22        (WebCore):
     23        (BatteryClientEfl):
     24        (WebCore::BatteryClientEfl::~BatteryClientEfl):
     25        * ewk/ewk_view.cpp:
     26        (_Ewk_View_Private_Data):
     27        (_ewk_view_priv_new):
     28
    1292012-03-13  Jon Lee  <jonlee@apple.com>
    230

  • trunk/Source/WebKit/efl/ewk/ewk_view.cpp

    r109205 r110991  
    7373#if ENABLE(VIBRATION)
    7474#include "VibrationClientEfl.h"
     75#endif
     76
     77#if ENABLE(BATTERY_STATUS)
     78#include "BatteryClientEfl.h"
    7579#endif
    7680
    … …  
    619623#endif
    620624
     625#if ENABLE(BATTERY_STATUS)
     626    WebCore::provideBatteryTo(priv->page.get(), new WebCore::BatteryClientEfl);
     627#endif
     628
    621629    priv->pageSettings = priv->page->settings();
    622630

  • trunk/Source/cmake/OptionsEfl.cmake

    r110896 r110991  
    6565SET(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
    6666
     67WEBKIT_FEATURE(ENABLE_BATTERY_STATUS "Enable battery status api" DEFAULT ON)
    6768WEBKIT_FEATURE(ENABLE_BLOB "Enable blob slice" DEFAULT OFF)
    6869WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT ON)

  • trunk/Source/cmakeconfig.h.cmake

    r110713 r110991  
    77
    88#cmakedefine01 ENABLE_AS_IMAGE
     9#cmakedefine01 ENABLE_BATTERY_STATUS
    910#cmakedefine01 ENABLE_BLOB
    1011#cmakedefine01 ENABLE_CHANNEL_MESSAGING

  • trunk/Tools/ChangeLog

    r110990 r110991  
     12012-03-16  Kihong Kwon  <kihong.kwon@samsung.com>
     2
     3        Support for Battery Status API
     4        https://bugs.webkit.org/show_bug.cgi?id=62698
     5
     6        Add include directory and file.
     7        http://www.w3.org/TR/battery-status/
     8
     9        Reviewed by Adam Barth.
     10
     11        * Scripts/build-webkit:
     12
    1132012-03-16  Kishore Bolisetty  <kbolisetty@innominds.com>
    214

  • trunk/Tools/Scripts/build-webkit

    r110963 r110991  
    7171    $accelerated2dCanvasSupport,
    7272    $animationAPISupport,
     73    $batterystatusAPISupport,
    7374    $blobSupport,
    7475    $channelMessagingSupport,
    … …  
    161162      define => "ENABLE_ANIMATION_API", default => isBlackBerry(), value => \$animationAPISupport },
    162163
     164    { option => "battery-status-api", desc => "Toggle battery status API support",
     165      define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batterystatusAPISupport },
     166
    163167    { option => "blob", desc => "Toggle Blob support",
    164168      define => "ENABLE_BLOB", default => (isAppleMacWebKit() || isGtk() || isChromium() || isBlackBerry()), value => \$blobSupport },
Note: See TracChangeset for help on using the changeset viewer.