| Index: Source/modules/battery/NavigatorBattery.cpp
|
| diff --git a/Source/modules/battery/NavigatorBattery.cpp b/Source/modules/battery/NavigatorBattery.cpp
|
| index caaff759521c652ec60c0a3cd7d7c2bc01d6a656..b72e98f728fdc6b08e889b30b84fb271ccea0751 100644
|
| --- a/Source/modules/battery/NavigatorBattery.cpp
|
| +++ b/Source/modules/battery/NavigatorBattery.cpp
|
| @@ -18,16 +18,17 @@ NavigatorBattery::~NavigatorBattery()
|
| {
|
| }
|
|
|
| -BatteryManager* NavigatorBattery::battery(Navigator& navigator)
|
| +ScriptPromise NavigatorBattery::getBattery(ScriptState* scriptState, Navigator& navigator)
|
| {
|
| - return NavigatorBattery::from(navigator).batteryManager(navigator);
|
| + return NavigatorBattery::from(navigator).getBattery(scriptState);
|
| }
|
|
|
| -BatteryManager* NavigatorBattery::batteryManager(Navigator& navigator)
|
| +ScriptPromise NavigatorBattery::getBattery(ScriptState* scriptState)
|
| {
|
| - if (!m_batteryManager && navigator.frame())
|
| - m_batteryManager = BatteryManager::create(navigator.frame()->document());
|
| - return m_batteryManager.get();
|
| + if (!m_batteryManager)
|
| + m_batteryManager = BatteryManager::create(scriptState->executionContext());
|
| +
|
| + return m_batteryManager->startRequest(scriptState);
|
| }
|
|
|
| const char* NavigatorBattery::supplementName()
|
|
|