Deduplicate DeviceEvent* classes

Source/modules/gamepad/NavigatorGamepad.cpp

 /*
  * Copyright (C) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 111 matching lines @@
     return m_gamepads.get();
 }
 
 void NavigatorGamepad::trace(Visitor* visitor)
 {
     visitor->trace(m_gamepads);
     visitor->trace(m_webkitGamepads);
     WillBeHeapSupplement<Navigator>::trace(visitor);
 }
 
-void NavigatorGamepad::didConnectOrDisconnectGamepad(unsigned index, const blink::WebGamepad& webGamepad, bool connected)
+void NavigatorGamepad::didUpdateData()
 {
-    ASSERT(index < blink::WebGamepads::itemsLengthCap);
-    ASSERT(connected == webGamepad.connected);
-
     // We should stop listening once we detached.
     ASSERT(window());
 
     // We register to the dispatcher before sampling gamepads so we need to check if we actually have an event listener.
     if (!m_hasEventListener)
         return;
 
     if (window()->document()->activeDOMObjectsAreStopped() || window()->document()->activeDOMObjectsAreSuspended())
         return;
 
+    unsigned index;
+    const blink::WebGamepad& webGamepad = GamepadDispatcher::instance().latestGamepadEventData(index);

[timvolodine, 2014/06/16 13:05:17]

do you need to pass index here? maybe just return the lastestGamepad data.

[kbalazs, 2014/06/16 17:01:47]

Yes, the index is used below, it was an argument of the function :)

[timvolodine, 2014/06/16 17:13:35]

ah I see, so that looks confusing to me. maybe introduce another method
latestGamepadIndex? i think that'd be cleaner.

+
     if (!m_gamepads)
         m_gamepads = GamepadList::create();
 
     Gamepad* gamepad = m_gamepads->item(index);
     if (!gamepad)
         gamepad = Gamepad::create();
     sampleGamepad(index, *gamepad, webGamepad);
     m_gamepads->set(index, gamepad);
 
-    const AtomicString& eventName = connected ? EventTypeNames::gamepadconnected : EventTypeNames::gamepaddisconnected;
-    RefPtrWillBeRawPtr<GamepadEvent> event = GamepadEvent::create(eventName, false, true, gamepad);
-    window()->dispatchEvent(event);
+    const AtomicString& eventName = webGamepad.connected ? EventTypeNames::gamepadconnected : EventTypeNames::gamepaddisconnected;
+    window()->dispatchEvent(GamepadEvent::create(eventName, false, true, gamepad));
 }
 
 NavigatorGamepad::NavigatorGamepad(LocalFrame* frame)
     : DOMWindowProperty(frame)
-    , DeviceSensorEventController(frame ? frame->page() : 0)
+    , DeviceEventControllerBase(frame ? frame->page() : 0)
     , DOMWindowLifecycleObserver(frame ? frame->domWindow() : 0)
 {
 }
 
 NavigatorGamepad::~NavigatorGamepad()
 {
 }
 
 const char* NavigatorGamepad::supplementName()
 {
     return "NavigatorGamepad";
 }
 
 void NavigatorGamepad::willDestroyGlobalObjectInFrame()
 {
     stopUpdating();
     DOMWindowProperty::willDestroyGlobalObjectInFrame();
 }
 
 void NavigatorGamepad::willDetachGlobalObjectFromFrame()
 {
     stopUpdating();
     DOMWindowProperty::willDetachGlobalObjectFromFrame();
 }
 
 void NavigatorGamepad::registerWithDispatcher()
 {
-    GamepadDispatcher::instance().addClient(this);
+    GamepadDispatcher::instance().addController(this);
 }
 
 void NavigatorGamepad::unregisterWithDispatcher()
 {
-    GamepadDispatcher::instance().removeClient(this);
+    GamepadDispatcher::instance().removeController(this);
 }
 
 bool NavigatorGamepad::hasLastData()
 {
     // Gamepad data is polled instead of pushed.
     return false;
 }
 
-PassRefPtrWillBeRawPtr<Event> NavigatorGamepad::getLastEvent()
-{
-    // This is called only when hasLastData() is true.
-    ASSERT_NOT_REACHED();
-    return nullptr;
-}
-
-bool NavigatorGamepad::isNullEvent(Event*)
-{
-    // This is called only when hasLastData() is true.
-    ASSERT_NOT_REACHED();
-    return false;
-}
-
-Document* NavigatorGamepad::document()
-{
-    return window() ? window()->document() : 0;
-}
-
 static bool isGamepadEvent(const AtomicString& eventType)
 {
     return eventType == EventTypeNames::gamepadconnected || eventType == EventTypeNames::gamepaddisconnected;
 }
 
 void NavigatorGamepad::didAddEventListener(DOMWindow*, const AtomicString& eventType)
 {
     if (RuntimeEnabledFeatures::gamepadEnabled() && isGamepadEvent(eventType)) {
         if (page() && page()->visibilityState() == PageVisibilityStateVisible)
             startUpdating();
         m_hasEventListener = true;
     }
 }
 
-void NavigatorGamepad::didRemoveEventListener(DOMWindow*, const AtomicString& eventType)
+void NavigatorGamepad::didRemoveEventListener(DOMWindow* window, const AtomicString& eventType)
 {
-    if (isGamepadEvent(eventType))
+    if (isGamepadEvent(eventType)
+        && !window->hasEventListeners(EventTypeNames::gamepadconnected)
+        && !window->hasEventListeners(EventTypeNames::gamepaddisconnected)) {
         m_hasEventListener = false;
+    }
 }
 
 void NavigatorGamepad::didRemoveAllEventListeners(DOMWindow*)
 {
     m_hasEventListener = false;
 }
 
 } // namespace WebCore