Revert of Remove DOMWindowProperty::willDetachGlobalObjectFromFrame

third_party/WebKit/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 88 matching lines @@
         sampleGamepads<Gamepad>(m_gamepads.get());
     return m_gamepads.get();
 }
 
 DEFINE_TRACE(NavigatorGamepad)
 {
     visitor->trace(m_gamepads);
     visitor->trace(m_pendingEvents);
     visitor->trace(m_dispatchOneEventRunner);
     Supplement<Navigator>::trace(visitor);
-    ContextLifecycleObserver::trace(visitor);
+    DOMWindowProperty::trace(visitor);
     PlatformEventController::trace(visitor);
 }
 
 bool NavigatorGamepad::startUpdatingIfAttached()
 {
-    Document* document = static_cast<Document*>(getExecutionContext());
     // The frame must be attached to start updating.
-    if (document && document->frame()) {
+    if (frame() && frame()->host()) {
         startUpdating();
         return true;
     }
     return false;
 }
 
 void NavigatorGamepad::didUpdateData()
 {
     // We should stop listening once we detached.
-    Document* document = static_cast<Document*>(getExecutionContext());
-    DCHECK(document->frame());
-    DCHECK(document->frame()->domWindow());
+    ASSERT(frame());
+    ASSERT(frame()->domWindow());
 
     // We register to the dispatcher before sampling gamepads so we need to check if we actually have an event listener.
     if (!m_hasEventListener)
         return;
 
+    Document* document = frame()->domWindow()->document();
     if (document->activeDOMObjectsAreStopped() || document->activeDOMObjectsAreSuspended())
         return;
 
     const GamepadDispatcher::ConnectionChange& change = GamepadDispatcher::instance().latestConnectionChange();
 
     if (!m_gamepads)
         m_gamepads = GamepadList::create();
 
     Gamepad* gamepad = m_gamepads->item(change.index);
     if (!gamepad)
         gamepad = Gamepad::create();
     sampleGamepad(change.index, *gamepad, change.pad);
     m_gamepads->set(change.index, gamepad);
 
     m_pendingEvents.append(gamepad);
     m_dispatchOneEventRunner->runAsync();
 }
 
 void NavigatorGamepad::dispatchOneEvent()
 {
-    Document* document = static_cast<Document*>(getExecutionContext());
-    DCHECK(document->frame());
-    DCHECK(document->frame()->domWindow());
-    DCHECK(!m_pendingEvents.isEmpty());
+    ASSERT(frame());
+    ASSERT(frame()->domWindow());
+    ASSERT(!m_pendingEvents.isEmpty());
 
     Gamepad* gamepad = m_pendingEvents.takeFirst();
     const AtomicString& eventName = gamepad->connected() ? EventTypeNames::gamepadconnected : EventTypeNames::gamepaddisconnected;
-    document->frame()->domWindow()->dispatchEvent(GamepadEvent::create(eventName, false, true, gamepad));
+    frame()->domWindow()->dispatchEvent(GamepadEvent::create(eventName, false, true, gamepad));
 
     if (!m_pendingEvents.isEmpty())
         m_dispatchOneEventRunner->runAsync();
 }
 
 NavigatorGamepad::NavigatorGamepad(LocalFrame* frame)
-    : ContextLifecycleObserver(frame->document())
+    : DOMWindowProperty(frame)
     , PlatformEventController(frame ? frame->page() : 0)
     , m_dispatchOneEventRunner(AsyncMethodRunner<NavigatorGamepad>::create(this, &NavigatorGamepad::dispatchOneEvent))
 {
     if (frame)
         frame->localDOMWindow()->registerEventListenerObserver(this);
 }
 
 NavigatorGamepad::~NavigatorGamepad()
 {
 }
 
 const char* NavigatorGamepad::supplementName()
 {
     return "NavigatorGamepad";
 }
 
-void NavigatorGamepad::contextDestroyed()
+void NavigatorGamepad::willDestroyGlobalObjectInFrame()
 {
     stopUpdating();
+    DOMWindowProperty::willDestroyGlobalObjectInFrame();
+}
+
+void NavigatorGamepad::willDetachGlobalObjectFromFrame()
+{
+    stopUpdating();
+    DOMWindowProperty::willDetachGlobalObjectFromFrame();
 }
 
 void NavigatorGamepad::registerWithDispatcher()
 {
     GamepadDispatcher::instance().addController(this);
     m_dispatchOneEventRunner->resume();
 }
 
 void NavigatorGamepad::unregisterWithDispatcher()
 {
@@ skipping 52 matching lines @@
         stopUpdating();
 
     if (!visible || !m_hasEventListener)
         return;
 
     // Tell the page what has changed. m_gamepads contains the state before we became hidden.
     // We create a new snapshot and compare them.
     GamepadList* oldGamepads = m_gamepads.release();
     gamepads();
     GamepadList* newGamepads = m_gamepads.get();
-    DCHECK(newGamepads);
+    ASSERT(newGamepads);
 
     for (unsigned i = 0; i < WebGamepads::itemsLengthCap; ++i) {
         Gamepad* oldGamepad = oldGamepads ? oldGamepads->item(i) : 0;
         Gamepad* newGamepad = newGamepads->item(i);
         bool oldWasConnected = oldGamepad && oldGamepad->connected();
         bool newIsConnected = newGamepad && newGamepad->connected();
         bool connectedGamepadChanged = oldWasConnected && newIsConnected && oldGamepad->id() != newGamepad->id();
         if (connectedGamepadChanged || (oldWasConnected && !newIsConnected)) {
             oldGamepad->setConnected(false);
             m_pendingEvents.append(oldGamepad);
         }
         if (connectedGamepadChanged || (!oldWasConnected && newIsConnected)) {
             m_pendingEvents.append(newGamepad);
         }
     }
 
     if (!m_pendingEvents.isEmpty())
         m_dispatchOneEventRunner->runAsync();
 }
 
 } // namespace blink