Index: Source/modules/battery/BatteryManager.h |
diff --git a/Source/modules/battery/BatteryManager.h b/Source/modules/battery/BatteryManager.h |
index 4df04971940bb785332356180875e59d4c6b5e2f..4ddaa3462455f23d13da73d57dfec23dfc16f675 100644 |
--- a/Source/modules/battery/BatteryManager.h |
+++ b/Source/modules/battery/BatteryManager.h |
@@ -8,6 +8,7 @@ |
#include "core/dom/ContextLifecycleObserver.h" |
#include "core/dom/Document.h" |
#include "core/events/EventTarget.h" |
+#include "core/frame/DeviceSensorEventController.h" |
#include "heap/Handle.h" |
#include "modules/battery/BatteryStatus.h" |
@@ -15,7 +16,7 @@ namespace WebCore { |
class Navigator; |
-class BatteryManager FINAL : public RefCountedWillBeRefCountedGarbageCollected<BatteryManager>, public ContextLifecycleObserver, public EventTargetWithInlineData { |
+class BatteryManager FINAL : public RefCountedWillBeRefCountedGarbageCollected<BatteryManager>, public ActiveDOMObject, public DeviceSensorEventController, public EventTargetWithInlineData { |
DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<BatteryManager>); |
public: |
virtual ~BatteryManager(); |
@@ -35,14 +36,27 @@ public: |
DEFINE_ATTRIBUTE_EVENT_LISTENER(dischargingtimechange); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(levelchange); |
- void didChangeBatteryStatus(PassRefPtr<Event>, PassOwnPtr<BatteryStatus>); |
+ void didChangeBatteryStatus(PassRefPtr<Event>, PassRefPtr<BatteryStatus>); |
sof
2014/04/07 12:52:44
Change PassRefPtr<Event> to PassRefPtrWillBeRawPtr
|
+ |
+ // ActiveDOMObject implementation. |
+ virtual bool canSuspend() const { return true; } |
+ virtual void suspend() OVERRIDE; |
+ virtual void resume() OVERRIDE; |
+ virtual void stop() OVERRIDE; |
+ |
+ // DeviceSensorEventController |
+ virtual void registerWithDispatcher() OVERRIDE FINAL; |
sof
2014/04/07 12:52:44
Given that the class is decorated with FINAL, this
|
+ virtual void unregisterWithDispatcher() OVERRIDE FINAL; |
+ virtual bool hasLastData() OVERRIDE FINAL; |
+ virtual PassRefPtr<Event> getLastEvent() OVERRIDE FINAL; |
sof
2014/04/07 12:52:44
Change the return type to PassRefPtrWillBeRawPtr<E
|
+ virtual bool isNullEvent(Event*) OVERRIDE FINAL; |
void trace(Visitor*) { } |
private: |
explicit BatteryManager(ExecutionContext*); |
- OwnPtr<BatteryStatus> m_batteryStatus; |
+ RefPtr<BatteryStatus> m_batteryStatus; |
}; |
} |