Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use override keyword in BatteryManager
https://bugs.webkit.org/show_bug.cgi?id=130225

Reviewed by Daniel Bates.

* Modules/battery/BatteryManager.h:


Canonical link: https://commits.webkit.org/148195@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@165605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Jinwoo-Song committed Mar 14, 2014
1 parent 497d939 commit 71ae8e6
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
9 changes: 9 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
2014-03-14 Jinwoo Song <jinwoo7.song@samsung.com>

Use override keyword in BatteryManager
https://bugs.webkit.org/show_bug.cgi?id=130225

Reviewed by Daniel Bates.

* Modules/battery/BatteryManager.h:

2014-03-12 Gavin Barraclough <barraclough@apple.com>

Reduce memory use for static property maps
Expand Down
20 changes: 10 additions & 10 deletions Source/WebCore/Modules/battery/BatteryManager.h
Expand Up @@ -38,8 +38,8 @@ class BatteryManager : public ActiveDOMObject, public RefCounted<BatteryManager>
static PassRefPtr<BatteryManager> create(Navigator*);

// EventTarget implementation.
virtual EventTargetInterface eventTargetInterface() const { return BatteryManagerEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const override { return BatteryManagerEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const override { return ActiveDOMObject::scriptExecutionContext(); }

bool charging();
double chargingTime();
Expand All @@ -59,21 +59,21 @@ class BatteryManager : public ActiveDOMObject, public RefCounted<BatteryManager>
using RefCounted<BatteryManager>::deref;

// ActiveDOMObject implementation.
virtual bool canSuspend() const { return true; }
virtual void suspend(ReasonForSuspension);
virtual void resume();
virtual void stop();
virtual bool canSuspend() const override { return true; }
virtual void suspend(ReasonForSuspension) override;
virtual void resume() override;
virtual void stop() override;

protected:
virtual EventTargetData* eventTargetData() { return &m_eventTargetData; }
virtual EventTargetData& ensureEventTargetData() { return m_eventTargetData; }
virtual EventTargetData* eventTargetData() override { return &m_eventTargetData; }
virtual EventTargetData& ensureEventTargetData() override { return m_eventTargetData; }

private:
explicit BatteryManager(Navigator*);

// EventTarget implementation.
virtual void refEventTarget() { ref(); }
virtual void derefEventTarget() { deref(); }
virtual void refEventTarget() override { ref(); }
virtual void derefEventTarget() override { deref(); }

BatteryController* m_batteryController;
EventTargetData m_eventTargetData;
Expand Down

0 comments on commit 71ae8e6

Please sign in to comment.