Changeset 113845 in webkit

Timestamp:

Apr 11, 2012 3:00:21 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Add Battery Status API support.

Source/WebCore:

Add Battery Status API support to chromium.
​https://bugs.webkit.org/show_bug.cgi?id=83284

Patch by Sadrul Habib Chowdhury <​sadrul@chromium.org> on 2012-04-11
Reviewed by Adam Barth.

This change is covered by tests in batterystatus/.

• Modules/battery/BatteryController.cpp:

(WebCore::BatteryController::updateBatteryStatus):
(WebCore):

• Modules/battery/BatteryController.h:

(BatteryController):

• Modules/battery/BatteryManager.cpp:

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

• WebCore.gyp/WebCore.gyp:
• WebCore.gypi:

Source/WebKit/chromium:

The battery-client (BatteryClientChromium) will notify the client (WebBatteryStatusClient) when to start or stop
sending battery status updates. The client, in response will send the notifications to WebViewImpl, which sends
this update information to the WebCore::BatteryClient, and it triggers the appropriate javascript-callbacks.
The spec is at ​http://www.w3.org/TR/2011/WD-battery-status-20111129/.
​https://bugs.webkit.org/show_bug.cgi?id=83284

Patch by Sadrul Habib Chowdhury <​sadrul@chromium.org> on 2012-04-11
Reviewed by Adam Barth.

• WebKit.gyp:
• features.gypi:
• public/WebBatteryStatus.h: Added.

(WebKit):
(WebBatteryStatus):
(WebKit::WebBatteryStatus::WebBatteryStatus):

• public/WebBatteryStatusClient.h: Added.

(WebKit):
(WebBatteryStatusClient):
(WebKit::WebBatteryStatusClient::~WebBatteryStatusClient):

• public/WebView.h:

(WebKit):
(WebView):
(WebKit::WebView::updateBatteryStatus):

• public/WebViewClient.h:

(WebKit):
(WebViewClient):
(WebKit::WebViewClient::batteryStatusClient):

• src/BatteryClientImpl.cpp: Added.

(WebKit):
(WebKit::BatteryClientImpl::BatteryClientImpl):
(WebKit::BatteryClientImpl::updateBatteryStatus):
(WebKit::BatteryClientImpl::setController):
(WebKit::BatteryClientImpl::startUpdating):
(WebKit::BatteryClientImpl::stopUpdating):
(WebKit::BatteryClientImpl::batteryControllerDestroyed):

• src/BatteryClientImpl.h: Added.

(WebKit):
(BatteryClientImpl):
(WebKit::BatteryClientImpl::~BatteryClientImpl):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl):
(WebKit):
(WebKit::WebViewImpl::updateBatteryStatus):

• src/WebViewImpl.h:

(WebKit):
(WebViewImpl):

LayoutTests:

Add Battery Status API support to chromium.
​https://bugs.webkit.org/show_bug.cgi?id=83284

Patch by Sadrul Habib Chowdhury <​sadrul@chromium.org> on 2012-04-11
Reviewed by Adam Barth.

• platform/chromium/fast/dom/navigator-detached-no-crash-expected.txt:
• platform/chromium/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/fast/dom/navigator-detached-no-crash-expected.txt (modified) (2 diffs)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/battery/BatteryController.cpp (modified) (2 diffs)
• Source/WebCore/Modules/battery/BatteryController.h (modified) (3 diffs)
• Source/WebCore/Modules/battery/BatteryManager.cpp (modified) (4 diffs)
• Source/WebCore/WebCore.gyp/WebCore.gyp (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (2 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/WebKit.gyp (modified) (2 diffs)
• Source/WebKit/chromium/features.gypi (modified) (1 diff)
• Source/WebKit/chromium/public/WebBatteryStatus.h (added)
• Source/WebKit/chromium/public/WebBatteryStatusClient.h (added)
• Source/WebKit/chromium/public/WebView.h (modified) (2 diffs)
• Source/WebKit/chromium/public/WebViewClient.h (modified) (2 diffs)
• Source/WebKit/chromium/src/BatteryClientImpl.cpp (added)
• Source/WebKit/chromium/src/BatteryClientImpl.h (added)
• Source/WebKit/chromium/src/WebViewImpl.cpp (modified) (4 diffs)
• Source/WebKit/chromium/src/WebViewImpl.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-11  Sadrul Habib Chowdhury  <sadrul@chromium.org>
+
+        [chromium] Add Battery Status API support.
+
+        Add Battery Status API support to chromium.
+        https://bugs.webkit.org/show_bug.cgi?id=83284
+
+        Reviewed by Adam Barth.
+
+        * platform/chromium/fast/dom/navigator-detached-no-crash-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2012-04-11  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/platform/chromium/fast/dom/navigator-detached-no-crash-expected.txt

@@ -18 +18 @@
 navigator.vendor is OK
 navigator.vendorSub is OK
+navigator.webkitBattery is OK
 navigator.webkitGamepads is OK
 navigator.webkitPointer is OK
@@ -38 +39 @@
 navigator.vendor is OK
 navigator.vendorSub is OK
+navigator.webkitBattery is OK
 navigator.webkitGamepads is OK
 navigator.webkitPointer is OK

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -136 +136 @@
 // Vibration API is not supported yet in the chromium port.
 BUGWK72010 SKIP : fast/dom/navigator-vibration.html = FAIL
-
-// Battery Status API is not supported yet in the chromium port.
-BUGWK62698 SKIP : batterystatus = PASS FAIL
 
 // Touch Adjustment is not supported yet in the chromium port.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-11  Sadrul Habib Chowdhury  <sadrul@chromium.org>
+
+        [chromium] Add Battery Status API support.
+
+        Add Battery Status API support to chromium.
+        https://bugs.webkit.org/show_bug.cgi?id=83284
+
+        Reviewed by Adam Barth.
+
+        This change is covered by tests in batterystatus/.
+
+        * Modules/battery/BatteryController.cpp:
+        (WebCore::BatteryController::updateBatteryStatus):
+        (WebCore):
+        * Modules/battery/BatteryController.h:
+        (BatteryController):
+        * Modules/battery/BatteryManager.cpp:
+        (WebCore::BatteryManager::charging):
+        (WebCore::BatteryManager::chargingTime):
+        (WebCore::BatteryManager::dischargingTime):
+        (WebCore::BatteryManager::level):
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+
 2012-04-11  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/Modules/battery/BatteryController.cpp

@@ -1 +1 @@
 /*
  *  Copyright (C) 2012 Samsung Electronics
+ *  Copyright (C) 2012 Google Inc.
  *
  *  This library is free software; you can redistribute it and/or
@@ -64 +65 @@
 }
 
+void BatteryController::updateBatteryStatus(PassRefPtr<BatteryStatus> batteryStatus)
+{
+    RefPtr<BatteryStatus> status = batteryStatus;
+    if (m_batteryStatus) {
+        if (m_batteryStatus->charging() != status->charging())
+            didChangeBatteryStatus(WebCore::eventNames().chargingchangeEvent, status);
+        else if (status->charging() && m_batteryStatus->chargingTime() != status->chargingTime())
+            didChangeBatteryStatus(WebCore::eventNames().chargingtimechangeEvent, status);
+        else if (!status->charging() && m_batteryStatus->dischargingTime() != status->dischargingTime())
+            didChangeBatteryStatus(WebCore::eventNames().dischargingtimechangeEvent, status);
+
+        if (m_batteryStatus->level() != status->level())
+            didChangeBatteryStatus(WebCore::eventNames().levelchangeEvent, status);
+    }
+
+    m_batteryStatus = status.release();
+}
+
 void BatteryController::didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus> batteryStatus)
 {

trunk/Source/WebCore/Modules/battery/BatteryController.h

@@ -1 +1 @@
 /*
  *  Copyright (C) 2012 Samsung Electronics
+ *  Copyright (C) 2012 Google Inc.
  *
  *  This library is free software; you can redistribute it and/or
@@ -38 +39 @@
     void addListener(BatteryManager*);
     void removeListener(BatteryManager*);
+    void updateBatteryStatus(PassRefPtr<BatteryStatus>);
     void didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus>);
 
@@ -53 +55 @@
     BatteryClient* m_client;
     ListenerVector m_listeners;
+
+    RefPtr<BatteryStatus> m_batteryStatus;
 };
 

trunk/Source/WebCore/Modules/battery/BatteryManager.cpp

@@ -25 +25 @@
 #include "BatteryController.h"
 #include "BatteryStatus.h"
+#include "Document.h"
 #include "Event.h"
 #include "Frame.h"
@@ -53 +54 @@
 bool BatteryManager::charging()
 {
-    return m_batteryStatus->charging();
+    return m_batteryStatus ? m_batteryStatus->charging() : true;
 }
 
 double BatteryManager::chargingTime()
 {
-    if (!m_batteryStatus->charging())
+    if (!m_batteryStatus || !m_batteryStatus->charging())
         return std::numeric_limits<double>::infinity();
 
@@ -66 +67 @@
 double BatteryManager::dischargingTime()
 {
-    if (m_batteryStatus->charging())
+    if (!m_batteryStatus || m_batteryStatus->charging())
         return std::numeric_limits<double>::infinity();
 
@@ -74 +75 @@
 double BatteryManager::level()
 {
-    return m_batteryStatus->level();
+    return m_batteryStatus ? m_batteryStatus->level() : 1;
 }
 

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -52 +52 @@
       '../',
       '../..',
+      '../Modules/battery',
       '../Modules/filesystem',
       '../Modules/filesystem/chromium',

trunk/Source/WebCore/WebCore.gypi

@@ -748 +748 @@
         ],
         'webcore_bindings_idl_files': [
+            'Modules/battery/BatteryManager.idl',
+            'Modules/battery/NavigatorBattery.idl',
             'Modules/filesystem/DOMFileSystem.idl',
             'Modules/filesystem/DOMFileSystemSync.idl',
@@ -1331 +1333 @@
         ],
         'webcore_files': [
+            'Modules/battery/BatteryClient.h',
+            'Modules/battery/BatteryController.cpp',
+            'Modules/battery/BatteryController.h',
+            'Modules/battery/BatteryManager.cpp',
+            'Modules/battery/BatteryManager.h',
+            'Modules/battery/BatteryStatus.cpp',
+            'Modules/battery/BatteryStatus.h',
+            'Modules/battery/NavigatorBattery.cpp',
+            'Modules/battery/NavigatorBattery.h',
             'Modules/filesystem/DOMFilePath.cpp',
             'Modules/filesystem/DOMFilePath.h',

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-04-11  Sadrul Habib Chowdhury  <sadrul@chromium.org>
+
+        [chromium] Add Battery Status API support.
+
+        The battery-client (BatteryClientChromium) will notify the client (WebBatteryStatusClient) when to start or stop
+        sending battery status updates. The client, in response will send the notifications to WebViewImpl, which sends
+        this update information to the WebCore::BatteryClient, and it triggers the appropriate javascript-callbacks.
+        The spec is at http://www.w3.org/TR/2011/WD-battery-status-20111129/.
+        https://bugs.webkit.org/show_bug.cgi?id=83284
+
+        Reviewed by Adam Barth.
+
+        * WebKit.gyp:
+        * features.gypi:
+        * public/WebBatteryStatus.h: Added.
+        (WebKit):
+        (WebBatteryStatus):
+        (WebKit::WebBatteryStatus::WebBatteryStatus):
+        * public/WebBatteryStatusClient.h: Added.
+        (WebKit):
+        (WebBatteryStatusClient):
+        (WebKit::WebBatteryStatusClient::~WebBatteryStatusClient):
+        * public/WebView.h:
+        (WebKit):
+        (WebView):
+        (WebKit::WebView::updateBatteryStatus):
+        * public/WebViewClient.h:
+        (WebKit):
+        (WebViewClient):
+        (WebKit::WebViewClient::batteryStatusClient):
+        * src/BatteryClientImpl.cpp: Added.
+        (WebKit):
+        (WebKit::BatteryClientImpl::BatteryClientImpl):
+        (WebKit::BatteryClientImpl::updateBatteryStatus):
+        (WebKit::BatteryClientImpl::setController):
+        (WebKit::BatteryClientImpl::startUpdating):
+        (WebKit::BatteryClientImpl::stopUpdating):
+        (WebKit::BatteryClientImpl::batteryControllerDestroyed):
+        * src/BatteryClientImpl.h: Added.
+        (WebKit):
+        (BatteryClientImpl):
+        (WebKit::BatteryClientImpl::~BatteryClientImpl):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::WebViewImpl):
+        (WebKit):
+        (WebKit::WebViewImpl::updateBatteryStatus):
+        * src/WebViewImpl.h:
+        (WebKit):
+        (WebViewImpl):
+
 2012-04-10  Ami Fischman  <fischman@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -103 +103 @@
                 'public/WebAudioSourceProviderClient.h',
                 'public/WebAutofillClient.h',
+                'public/WebBatteryStatus.h',
+                'public/WebBatteryStatusClient.h',
                 'public/WebBindings.h',
                 'public/WebBlob.h',
@@ -370 +372 @@
                 'src/BackForwardListChromium.cpp',
                 'src/BackForwardListChromium.h',
+                'src/BatteryClientImpl.cpp',
+                'src/BatteryClientImpl.h',
                 'src/BlobRegistryProxy.cpp',
                 'src/BlobRegistryProxy.h',

trunk/Source/WebKit/chromium/features.gypi

@@ -34 +34 @@
     'feature_defines': [
       'ENABLE_3D_PLUGIN=1',
+      'ENABLE_BATTERY_STATUS=1',
       'ENABLE_BLOB=1',
       'ENABLE_BLOB_SLICE=1',

trunk/Source/WebKit/chromium/public/WebView.h

@@ -42 +42 @@
 class WebAccessibilityObject;
 class WebAutofillClient;
+class WebBatteryStatus;
 class WebDevToolsAgent;
 class WebDevToolsAgentClient;
@@ -455 +456 @@
     virtual void removePageOverlay(WebPageOverlay*) = 0;
 
+    // Battery status API support -------------------------------------------
+
+    // Updates the battery status in the BatteryClient. This also triggers the
+    // appropriate JS events (e.g. sends a 'levelchange' event to JS if the
+    // level is changed in this update from the previous update).
+    virtual void updateBatteryStatus(const WebBatteryStatus&) { }
+
     // Testing functionality for LayoutTestController -----------------------
 

trunk/Source/WebKit/chromium/public/WebViewClient.h

@@ -49 +49 @@
 
 class WebAccessibilityObject;
+class WebBatteryStatusClient;
 class WebColorChooser;
 class WebColorChooserClient;
@@ -326 +327 @@
     virtual WebDeviceOrientationClient* deviceOrientationClient() { return 0; }
 
+    // Battery Status ------------------------------------------------------
+
+    // Access the embedder API for battery status services.
+    virtual WebBatteryStatusClient* batteryStatusClient() { return 0; }
 
     // Zoom ----------------------------------------------------------------

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -36 +36 @@
 #include "AutofillPopupMenuClient.h"
 #include "BackForwardListChromium.h"
+#include "BatteryClientImpl.h"
 #include "CSSStyleSelector.h"
 #include "CSSValueKeywords.h"
@@ -387 +388 @@
     , m_deviceOrientationClientProxy(adoptPtr(new DeviceOrientationClientProxy(client ? client->deviceOrientationClient() : 0)))
     , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? client->geolocationClient() : 0)))
+#if ENABLE(BATTERY_STATUS)
+    , m_batteryClient(adoptPtr(new BatteryClientImpl(client ? client->batteryStatusClient() : 0)))
+#endif
     , m_emulatedTextZoomFactor(1)
 #if ENABLE(MEDIA_STREAM)
@@ -424 +428 @@
     provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get());
     m_geolocationClientProxy->setController(GeolocationController::from(m_page.get()));
+
+#if ENABLE(BATTERY_STATUS)
+    provideBatteryTo(m_page.get(), m_batteryClient.get());
+#endif
     
     m_page->setGroupName(pageGroupName);
@@ -1375 +1383 @@
 }
 
+#if ENABLE(BATTERY_STATUS)
+void WebViewImpl::updateBatteryStatus(const WebBatteryStatus& status)
+{
+    m_batteryClient->updateBatteryStatus(status);
+}
+#endif
+
 void WebViewImpl::animate(double)
 {

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -82 +82 @@
 class AutocompletePopupMenuClient;
 class AutofillPopupMenuClient;
+class BatteryClientImpl;
 class ContextMenuClientImpl;
 class DeviceOrientationClientProxy;
@@ -258 +259 @@
     virtual void addPageOverlay(WebPageOverlay*, int /* zOrder */);
     virtual void removePageOverlay(WebPageOverlay*);
+#if ENABLE(BATTERY_STATUS)
+    virtual void updateBatteryStatus(const WebBatteryStatus&);
+#endif
     virtual void transferActiveWheelFlingAnimation(const WebActiveWheelFlingParameters&);
 
@@ -750 +754 @@
     OwnPtr<DeviceOrientationClientProxy> m_deviceOrientationClientProxy;
     OwnPtr<GeolocationClientProxy> m_geolocationClientProxy;
+#if ENABLE(BATTERY_STATUS)
+    OwnPtr<BatteryClientImpl> m_batteryClient;
+#endif
 
     float m_emulatedTextZoomFactor;