Changeset 117378 in webkit

Timestamp:

May 16, 2012 7:09:16 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Support for Battery Status API on the WebKit-Efl
​https://bugs.webkit.org/show_bug.cgi?id=83254

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-05-16
Reviewed by Chang Shu.

.:

Add dependency check for e_ukit package which is in the e_dbus library.

• Source/cmake/FindEFL.cmake:

Source/WebKit:

Add e_ukit library and include directory to get battery status of device.

• PlatformEfl.cmake:

Source/WebKit/efl:

The set of e_dbus libraries, e_ukit library in particular, enables to support all types of battery status events (e.g., charging, chargingTime, dischargingTime, level).

• WebCoreSupport/BatteryClientEfl.cpp:

(WebCore::BatteryClientEfl::BatteryClientEfl):
(WebCore::BatteryClientEfl::startUpdating):
(WebCore::BatteryClientEfl::stopUpdating):
(WebCore::BatteryClientEfl::setBatteryStatus):
(WebCore):
(WebCore::BatteryClientEfl::timerFired):
(WebCore::BatteryClientEfl::getBatteryStatus):
(WebCore::BatteryClientEfl::setBatteryClient):

• WebCoreSupport/BatteryClientEfl.h:

(WebCore::BatteryClientEfl::batteryStatus):
(BatteryClientEfl):

Tools:

Add e_dbus libraries to jhbuild's modules list.

• efl/jhbuild.modules:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformEfl.cmake (modified) (2 diffs)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp (modified) (4 diffs)
• Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h (modified) (2 diffs)
• Source/cmake/FindEFL.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/efl/jhbuild.modules (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-05-16  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        [EFL] Support for Battery Status API on the WebKit-Efl
+        https://bugs.webkit.org/show_bug.cgi?id=83254
+
+        Reviewed by Chang Shu.
+
+        Add dependency check for e_ukit package which is in the e_dbus library.
+
+        * Source/cmake/FindEFL.cmake:
+
 2012-05-16  Varun Jain  <varunjain@google.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-05-16  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        [EFL] Support for Battery Status API on the WebKit-Efl
+        https://bugs.webkit.org/show_bug.cgi?id=83254
+
+        Reviewed by Chang Shu.
+
+        Add e_ukit library and include directory to get battery status of device.
+
+        * PlatformEfl.cmake:
+
 2012-05-15  Tomasz Morawski  <t.morawski@samsung.com>
 

trunk/Source/WebKit/PlatformEfl.cmake

@@ -20 +20 @@
     ${EFLDEPS_INCLUDE_DIRS}
     ${EVAS_INCLUDE_DIRS}
+    ${EUKIT_INCLUDE_DIRS}
     ${LIBXML2_INCLUDE_DIR}
     ${LIBXSLT_INCLUDE_DIR}
@@ -125 +126 @@
     ${ECORE_X_LIBRARIES}
     ${EFLDEPS_LIBRARIES}
+    ${EUKIT_LIBRARIES}
     ${FREETYPE_LIBRARIES}
     ${LIBXML2_LIBRARIES}

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-05-16  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        [EFL] Support for Battery Status API on the WebKit-Efl
+        https://bugs.webkit.org/show_bug.cgi?id=83254
+
+        Reviewed by Chang Shu.
+
+        The set of e_dbus libraries, e_ukit library in particular, enables to support all types of battery status events (e.g., charging, chargingTime, dischargingTime, level).
+
+        * WebCoreSupport/BatteryClientEfl.cpp:
+        (WebCore::BatteryClientEfl::BatteryClientEfl):
+        (WebCore::BatteryClientEfl::startUpdating):
+        (WebCore::BatteryClientEfl::stopUpdating):
+        (WebCore::BatteryClientEfl::setBatteryStatus):
+        (WebCore):
+        (WebCore::BatteryClientEfl::timerFired):
+        (WebCore::BatteryClientEfl::getBatteryStatus):
+        (WebCore::BatteryClientEfl::setBatteryClient):
+        * WebCoreSupport/BatteryClientEfl.h:
+        (WebCore::BatteryClientEfl::batteryStatus):
+        (BatteryClientEfl):
+
 2012-05-16  Thiago Marcos P. Santos  <thiago.santos@intel.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.cpp

@@ -24 +24 @@
 
 #include "BatteryController.h"
+#include "EventNames.h"
+#include <limits>
 
 namespace WebCore {
@@ -29 +31 @@
 BatteryClientEfl::BatteryClientEfl()
     : m_controller(0)
+    , m_timer(this, &BatteryClientEfl::timerFired)
+    , m_batteryStatusRefreshInterval(1.0)
 {
 }
@@ -39 +43 @@
 void BatteryClientEfl::startUpdating()
 {
-    // FIXME: Need to implement for getting battery status to the efl port.
+    if (m_timer.isActive())
+        return;
+
+    if (!e_dbus_init())
+        return;
+
+    if (!e_ukit_init()) {
+        e_dbus_shutdown();
+        return;
+    }
+
+    m_timer.startRepeating(m_batteryStatusRefreshInterval);
 }
 
 void BatteryClientEfl::stopUpdating()
 {
-    // FIXME: Need to implement for getting battery status to the efl port
+    m_timer.stop();
+    e_ukit_shutdown();
+    e_dbus_shutdown();
 }
 
@@ -54 +71 @@
 void BatteryClientEfl::setBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus> batteryStatus)
 {
-    m_controller->didChangeBatteryStatus(eventType, batteryStatus);
+    m_batteryStatus = batteryStatus;
+    m_controller->didChangeBatteryStatus(eventType, m_batteryStatus);
+}
+
+void BatteryClientEfl::timerFired(Timer<BatteryClientEfl>* timer)
+{
+    ASSERT_UNUSED(timer, timer == &m_timer);
+    E_DBus_Connection* edbusConnection = e_dbus_bus_get(DBUS_BUS_SYSTEM);
+    if (edbusConnection)
+        e_upower_get_all_devices(edbusConnection, getBatteryStatus, static_cast<void*>(this));
+}
+
+void BatteryClientEfl::getBatteryStatus(void* data, void* replyData, DBusError* dBusError)
+{
+    E_Ukit_Get_All_Devices_Return* eukitDeviceNames = static_cast<E_Ukit_Get_All_Devices_Return*>(replyData);
+    if (!eukitDeviceNames || !eukitDeviceNames->strings || dbus_error_is_set(dBusError)) {
+         dbus_error_free(dBusError);
+         return;
+    }
+
+    E_DBus_Connection* edbusConnection = e_dbus_bus_get(DBUS_BUS_SYSTEM);
+    Eina_List* list;
+    void* deviceName;
+    EINA_LIST_FOREACH(eukitDeviceNames->strings, list, deviceName)
+        e_upower_get_all_properties(edbusConnection, static_cast<char*>(deviceName), setBatteryClient, data);
+}
+
+void BatteryClientEfl::setBatteryClient(void* data, void* replyData, DBusError* dBusError)
+{
+    E_Ukit_Get_All_Properties_Return* eukitPropertyNames = static_cast<E_Ukit_Get_All_Properties_Return*>(replyData);
+
+    if (!eukitPropertyNames || dbus_error_is_set(dBusError)) {
+        dbus_error_free(dBusError);
+        return;
+    }
+
+    if (!eukitPropertyNames->properties)
+        return;
+
+    E_Ukit_Property* property = static_cast<E_Ukit_Property*>(eina_hash_find(eukitPropertyNames->properties, "Type"));
+    if (!property || property->val.u != E_UPOWER_SOURCE_BATTERY)
+        return;
+
+    BatteryClientEfl* client = static_cast<BatteryClientEfl*>(data);
+    BatteryStatus* clientBatteryStatus = client->batteryStatus();
+    bool charging = false;
+    bool chargingChanged = false;
+    static unsigned chargingState = 0;
+
+    property = static_cast<E_Ukit_Property*>(eina_hash_find(eukitPropertyNames->properties, "State"));
+    if (!property)
+        return;
+    if (!clientBatteryStatus || chargingState != property->val.u) {
+        chargingChanged = true;
+        chargingState = property->val.u;
+        (chargingState == E_UPOWER_STATE_FULL || chargingState == E_UPOWER_STATE_CHARGING) ? charging = true : charging = false;
+    } else
+        charging = clientBatteryStatus->charging();
+
+    bool chargingTimeChanged = false;
+    bool dischargingTimeChanged = false;
+    double chargingTime = std::numeric_limits<double>::infinity();
+    double dischargingTime = std::numeric_limits<double>::infinity();
+
+    if (charging) {
+        if (!clientBatteryStatus || clientBatteryStatus->dischargingTime() != std::numeric_limits<double>::infinity())
+            dischargingTimeChanged = true;
+        dischargingTime = std::numeric_limits<double>::infinity();
+        property = static_cast<E_Ukit_Property*>(eina_hash_find(eukitPropertyNames->properties, "TimeToFull"));
+        if (!property)
+            return;
+        if (!clientBatteryStatus || clientBatteryStatus->chargingTime() != property->val.x)
+            chargingTimeChanged = true;
+        chargingTime = property->val.x;
+    } else {
+        if (!clientBatteryStatus || clientBatteryStatus->chargingTime() != std::numeric_limits<double>::infinity())
+            chargingTimeChanged = true;
+        chargingTime = std::numeric_limits<double>::infinity();
+        property = static_cast<E_Ukit_Property*>(eina_hash_find(eukitPropertyNames->properties, "TimeToEmpty"));
+        if (!property)
+            return;
+        if (!clientBatteryStatus || clientBatteryStatus->dischargingTime() != property->val.x)
+            dischargingTimeChanged = true;
+        dischargingTime = property->val.x;
+    }
+
+    double level = 0;
+    bool levelChanged = false;
+
+    property = static_cast<E_Ukit_Property*>(eina_hash_find(eukitPropertyNames->properties, "Percentage"));
+    if (!property)
+        return;
+    if (!clientBatteryStatus || clientBatteryStatus->level() != property->val.d)
+        levelChanged = true;
+    level = property->val.d;
+
+    WTF::RefPtr<BatteryStatus> batteryStatus = BatteryStatus::create(charging, chargingTime, dischargingTime, level);
+    if (chargingChanged)
+        client->setBatteryStatus(eventNames().chargingchangeEvent, batteryStatus);
+    if (chargingTimeChanged)
+        client->setBatteryStatus(eventNames().chargingtimechangeEvent, batteryStatus);
+    if (dischargingTimeChanged)
+        client->setBatteryStatus(eventNames().dischargingtimechangeEvent, batteryStatus);
+    if (levelChanged)
+        client->setBatteryStatus(eventNames().levelchangeEvent, batteryStatus);
 }
 

trunk/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h

@@ -24 +24 @@
 
 #include "BatteryClient.h"
+#include "BatteryStatus.h"
+#include "Timer.h"
+#include <E_Ukit.h>
 #include <wtf/text/AtomicString.h>
 
@@ -42 +45 @@
 
     void setBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus>);
+    BatteryStatus* batteryStatus() { return m_batteryStatus.get(); }
 
 private:
+    void timerFired(Timer<BatteryClientEfl>*);
+    static void getBatteryStatus(void* data, void* replyData, DBusError*);
+    static void setBatteryClient(void* data, void* replyData, DBusError*);
+
     BatteryController* m_controller;
+    Timer<BatteryClientEfl> m_timer;
+    RefPtr<BatteryStatus> m_batteryStatus;
+    const double m_batteryStatusRefreshInterval;
 };
 

trunk/Source/cmake/FindEFL.cmake

@@ -10 +10 @@
   ecore-file>=1.0.0
   ecore-evas>=1.0.999.59763
-  edje>=1.0.0)
+  edje>=1.0.0
+  eukit>=1.1.0)
 PKG_CHECK_MODULES (EINA REQUIRED eina>=1.0.0)
 PKG_CHECK_MODULES (ECORE_X ecore-x>=1.0.0)
 PKG_CHECK_MODULES (EVAS REQUIRED evas>=1.0.0)
+PKG_CHECK_MODULES (EUKIT REQUIRED eukit>=1.1.0)
 
 FIND_PROGRAM (EDJE_CC_EXECUTABLE edje_cc)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-16  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        [EFL] Support for Battery Status API on the WebKit-Efl
+        https://bugs.webkit.org/show_bug.cgi?id=83254
+
+        Reviewed by Chang Shu.
+
+        Add e_dbus libraries to jhbuild's modules list.
+
+        * efl/jhbuild.modules:
+
 2012-05-16  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Tools/efl/jhbuild.modules

@@ -14 +14 @@
       <dep package="libsoup"/>
       <dep package="edje"/>
+      <dep package="e_dbus"/>
     </dependencies>
   </metamodule>
@@ -208 +209 @@
   </autotools>
 
+  <autotools id="e_dbus">
+    <branch module="e_dbus"
+            repo="enlightenment.org"
+            revision="68629"/>
+    <dependencies>
+      <dep package="ecore"/>
+      <dep package="eina"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>