Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 12 insertions, 1 deletions

diff --git a/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp b/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp
index 950336d56..7a87d5d85 100644
--- a/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp
@@ -31,6 +31,7 @@
 
 #if ENABLE(BATTERY_STATUS)
 #include "WebBatteryManagerProxy.h"
+#include "WebBatteryStatus.h"
 #endif
 
 using namespace WebKit;
@@ -44,10 +45,13 @@ WKTypeID WKBatteryManagerGetTypeID()
 #endif
 }
 
-void WKBatteryManagerSetProvider(WKBatteryManagerRef batteryManager, const WKBatteryProvider* provider)
+void WKBatteryManagerSetProvider(WKBatteryManagerRef batteryManager, const WKBatteryProviderBase* provider)
 {
 #if ENABLE(BATTERY_STATUS)
     toImpl(batteryManager)->initializeProvider(provider);
+#else
+    UNUSED_PARAM(batteryManager);
+    UNUSED_PARAM(provider);
 #endif
 }
 
@@ -55,6 +59,10 @@ void WKBatteryManagerProviderDidChangeBatteryStatus(WKBatteryManagerRef batteryM
 {
 #if ENABLE(BATTERY_STATUS)
     toImpl(batteryManager)->providerDidChangeBatteryStatus(AtomicString(toImpl(eventType)->string()), toImpl(status));
+#else
+    UNUSED_PARAM(batteryManager);
+    UNUSED_PARAM(eventType);
+    UNUSED_PARAM(status);
 #endif
 }
 
@@ -62,5 +70,8 @@ void WKBatteryManagerProviderUpdateBatteryStatus(WKBatteryManagerRef batteryMana
 {
 #if ENABLE(BATTERY_STATUS)
     toImpl(batteryManager)->providerUpdateBatteryStatus(toImpl(status));
+#else
+    UNUSED_PARAM(batteryManager);
+    UNUSED_PARAM(status);
 #endif
 }