Generalize and refactor DeviceSensorEvent* architecture to support multi-event type targets.

Source/modules/battery/BatteryDispatcher.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/battery/BatteryDispatcher.h"
 
 #include "modules/battery/BatteryStatus.h"
 #include "platform/NotImplemented.h"
 #include "public/platform/Platform.h"
 
 namespace WebCore {
 
 BatteryDispatcher& BatteryDispatcher::instance()
 {
     DEFINE_STATIC_LOCAL(BatteryDispatcher, batteryDispatcher, ());
     return batteryDispatcher;
 }
 
 BatteryDispatcher::BatteryDispatcher()
 {
 }
 
 BatteryDispatcher::~BatteryDispatcher()
 {
 }
 
-void BatteryDispatcher::addClient(BatteryManager* batteryManager)
-{
-    addController(batteryManager);
-}
-
-void BatteryDispatcher::removeClient(BatteryManager* batteryManager)
-{
-    removeController(batteryManager);
-}
-
 void BatteryDispatcher::updateBatteryStatus(const blink::WebBatteryStatus& batteryStatus)
 {
-    RefPtr<BatteryStatus> oldStatus = m_batteryStatus;
     m_batteryStatus = BatteryStatus::create(batteryStatus.charging, batteryStatus.chargingTime, batteryStatus.dischargingTime, batteryStatus.level);
-
-    if (oldStatus) {
-        if (m_batteryStatus->charging() != oldStatus->charging())
-            didChangeBatteryStatus(EventTypeNames::chargingchange);
-        if (m_batteryStatus->charging() && m_batteryStatus->chargingTime() != oldStatus->chargingTime())
-            didChangeBatteryStatus(EventTypeNames::chargingtimechange);
-        if (!m_batteryStatus->charging() && m_batteryStatus->dischargingTime() != oldStatus->dischargingTime())
-            didChangeBatteryStatus(EventTypeNames::dischargingtimechange);
-        if (m_batteryStatus->level() != oldStatus->level())
-            didChangeBatteryStatus(EventTypeNames::levelchange);
-    } else {
-        // There was no previous state.
-        didChangeBatteryStatus(EventTypeNames::chargingchange);
-        didChangeBatteryStatus(EventTypeNames::chargingtimechange);
-        didChangeBatteryStatus(EventTypeNames::dischargingtimechange);
-        didChangeBatteryStatus(EventTypeNames::levelchange);
-    }
-
+    notifyControllers();
 }
 
-const BatteryStatus* BatteryDispatcher::getLatestData()
+PassRefPtr<BatteryStatus> BatteryDispatcher::getLatestData()

[Inactive, 2014/06/03 13:49:33]

It seems weird to return a PassRefPtr here since we are not transferring
ownership to the caller. In such cases, the convention in Blink is to return a
raw pointer.

[timvolodine, 2014/06/03 18:45:54]

The idea is to share the RefPtr with the BatteryManager class, i.e.
BatteryManager can keep a reference to this same data. That way no copying is
necessary and the actual refptr would be deleted only if both BatteryManager and
Dispatcher abandon it. For example SVGPathSegList::getItem() seems to perform a
similar approach.

[Inactive, 2014/06/03 19:04:23]

The fact that you are returning a raw pointer here does not prevent
BatteryManager from storing the return value in a RefPtr. This is a separate
issue. Our convention, as far as I know (I have been corrected in the past on
this matter), is that we return PassRefPtr<> only if we transfer ownership to
the caller (e.g. a factory function). For other cases, we return a raw pointer.
You are going to find some counter-examples in the code base, but it does not
mean that that code is right :)

 {
-    return m_batteryStatus.get();
-}
-
-void BatteryDispatcher::didChangeBatteryStatus(const AtomicString& eventType)
-{
-    RefPtrWillBeRawPtr<Event> event = Event::create(eventType);
-
-    {
-        TemporaryChange<bool> changeIsDispatching(m_isDispatching, true);
-        // Don't fire listeners removed or added during event dispatch.
-        size_t size = m_controllers.size();
-        for (size_t i = 0; i < size; ++i) {
-            if (m_controllers[i])
-                static_cast<BatteryManager*>(m_controllers[i])->didChangeBatteryStatus(event);
-        }
-    }
-
-    if (m_needsPurge)
-        purgeControllers();
+    return m_batteryStatus;
 }
 
 void BatteryDispatcher::startListening()
 {
     blink::Platform::current()->setBatteryStatusListener(this);
 }
 
 void BatteryDispatcher::stopListening()
 {
     blink::Platform::current()->setBatteryStatusListener(0);
+    m_batteryStatus.clear();
 }
 
 }