Changeset 113547 in webkit

Timestamp:

Apr 7, 2012, 8:30:43 AM (13 years ago)

Author:

[email protected]

Message:

[BlackBerry] Add Battery Status API support
​https://bugs.webkit.org/show_bug.cgi?id=82615

Reviewed by George Staikos.

.:

Enable BATTERY_STATUS.

• Source/cmake/OptionsBlackBerry.cmake:

Source/WebKit:

Add BatteryClientBlackBerry.cpp to the build.

• PlatformBlackBerry.cmake:

Source/WebKit/blackberry:

Add client implementation for Battery API.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::init): initialize BatteryClient.

• WebCoreSupport/BatteryClientBlackBerry.cpp: Added.

(WebCore):
(WebCore::BatteryClientBlackBerry::BatteryClientBlackBerry):
(WebCore::BatteryClientBlackBerry::setController):
(WebCore::BatteryClientBlackBerry::startUpdating):
(WebCore::BatteryClientBlackBerry::stopUpdating):
(WebCore::BatteryClientBlackBerry::batteryControllerDestroyed):
(WebCore::BatteryClientBlackBerry::onLevelChange):
(WebCore::BatteryClientBlackBerry::onChargingChange):
(WebCore::BatteryClientBlackBerry::onChargingTimeChange):
(WebCore::BatteryClientBlackBerry::onDischargingTimeChange):

• WebCoreSupport/BatteryClientBlackBerry.h: Added.

(WebCore):
(BatteryClientBlackBerry):
(WebCore::BatteryClientBlackBerry::~BatteryClientBlackBerry):

Tools:

Enable BATTERY_STATUS.

• Scripts/build-webkit:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformBlackBerry.cmake (modified) (1 diff)
• Source/WebKit/blackberry/Api/WebPage.cpp (modified) (2 diffs)
• Source/WebKit/blackberry/ChangeLog (modified) (1 diff)
• Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.cpp (added)
• Source/WebKit/blackberry/WebCoreSupport/BatteryClientBlackBerry.h (added)
• Source/cmake/OptionsBlackBerry.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-webkit (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-04-07  Rob Buis  <[email protected]>
+
+        [BlackBerry] Add Battery Status API support
+        https://bugs.webkit.org/show_bug.cgi?id=82615
+
+        Reviewed by George Staikos.
+
+        Enable BATTERY_STATUS.
+
+        * Source/cmake/OptionsBlackBerry.cmake:
+
 2012-04-06  Martin Robinson  <[email protected]>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-04-07  Rob Buis  <[email protected]>
+
+        [BlackBerry] Add Battery Status API support
+        https://bugs.webkit.org/show_bug.cgi?id=82615
+
+        Reviewed by George Staikos.
+
+        Add BatteryClientBlackBerry.cpp to the build.
+
+        * PlatformBlackBerry.cmake:
+
 2012-04-06  Charles Wei  <[email protected]>
 

trunk/Source/WebKit/PlatformBlackBerry.cmake

@@ -36 +36 @@
         "${TOOLS_DIR}/DumpRenderTree/blackberry"
     )
+ENDIF ()
+
+IF (ENABLE_BATTERY_STATUS)
+    LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${WEBCORE_DIR}/Modules/battery)
+    LIST(APPEND WebKit_SOURCES blackberry/WebCoreSupport/BatteryClientBlackBerry.cpp)
 ENDIF ()
 

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -26 +26 @@
 #include "BackingStoreCompositingSurface.h"
 #include "BackingStore_p.h"
+#if ENABLE(BATTERY_STATUS)
+#include "BatteryClientBlackBerry.h"
+#endif
 #include "CString.h"
 #include "CachedImage.h"
@@ -449 +452 @@
 #if ENABLE(VIBRATION)
     WebCore::provideVibrationTo(m_page, new VibrationClientBlackBerry());
+#endif
+
+#if ENABLE(BATTERY_STATUS)
+    WebCore::provideBatteryTo(m_page, new WebCore::BatteryClientBlackBerry);
 #endif
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-04-07  Rob Buis  <[email protected]>
+
+        [BlackBerry] Add Battery Status API support
+        https://bugs.webkit.org/show_bug.cgi?id=82615
+
+        Reviewed by George Staikos.
+
+        Add client implementation for Battery API.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::init):  initialize BatteryClient.
+        * WebCoreSupport/BatteryClientBlackBerry.cpp: Added.
+        (WebCore):
+        (WebCore::BatteryClientBlackBerry::BatteryClientBlackBerry):
+        (WebCore::BatteryClientBlackBerry::setController):
+        (WebCore::BatteryClientBlackBerry::startUpdating):
+        (WebCore::BatteryClientBlackBerry::stopUpdating):
+        (WebCore::BatteryClientBlackBerry::batteryControllerDestroyed):
+        (WebCore::BatteryClientBlackBerry::onLevelChange):
+        (WebCore::BatteryClientBlackBerry::onChargingChange):
+        (WebCore::BatteryClientBlackBerry::onChargingTimeChange):
+        (WebCore::BatteryClientBlackBerry::onDischargingTimeChange):
+        * WebCoreSupport/BatteryClientBlackBerry.h: Added.
+        (WebCore):
+        (BatteryClientBlackBerry):
+        (WebCore::BatteryClientBlackBerry::~BatteryClientBlackBerry):
+
 2012-04-06  Benjamin Poulain  <[email protected]>
 

trunk/Source/cmake/OptionsBlackBerry.cmake

@@ -134 +134 @@
 
 WEBKIT_FEATURE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Assembler WX Exclusive" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_BATTERY_STATUS "Enable battery status api" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_BLOB "Enable blob slice" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT ON)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-04-07  Rob Buis  <[email protected]>
+
+        [BlackBerry] Add Battery Status API support
+        https://bugs.webkit.org/show_bug.cgi?id=82615
+
+        Reviewed by George Staikos.
+
+        Enable BATTERY_STATUS.
+
+        * Scripts/build-webkit:
+
 2012-04-06  Ami Fischman  <[email protected]>
 

trunk/Tools/Scripts/build-webkit

@@ -165 +165 @@
 
     { option => "battery-status-api", desc => "Toggle battery status API support",
-      define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batterystatusAPISupport },
+      define => "ENABLE_BATTERY_STATUS", default => (isEfl() || isBlackBerry()), value => \$batterystatusAPISupport },
 
     { option => "blob", desc => "Toggle Blob support",