Remove DOMWindowLifecycleObserver::window()

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 79 matching lines @@
 
 GamepadList* NavigatorGamepad::getGamepads(Navigator& navigator)
 {
     return NavigatorGamepad::from(navigator).gamepads();
 }
 
 GamepadList* NavigatorGamepad::gamepads()
 {
     if (!m_gamepads)
         m_gamepads = GamepadList::create();
-    if (window()) {
+    if (frame() && frame()->domWindow()) {
         startUpdating();
         sampleGamepads<Gamepad>(m_gamepads.get());
     }
     return m_gamepads.get();
 }
 
 void NavigatorGamepad::trace(Visitor* visitor)
 {
     visitor->trace(m_gamepads);
     visitor->trace(m_pendingEvents);
     WillBeHeapSupplement<Navigator>::trace(visitor);
     DOMWindowProperty::trace(visitor);
     PlatformEventController::trace(visitor);
 }
 
 void NavigatorGamepad::didUpdateData()
 {
     // We should stop listening once we detached.
-    ASSERT(window());
+    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;
 
-    if (window()->document()->activeDOMObjectsAreStopped() || window()->document()->activeDOMObjectsAreSuspended())
+    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()
 {
-    ASSERT(window());
+    ASSERT(frame());
+    ASSERT(frame()->domWindow());
     ASSERT(!m_pendingEvents.isEmpty());
 
     Gamepad* gamepad = m_pendingEvents.takeFirst();
     const AtomicString& eventName = gamepad->connected() ? EventTypeNames::gamepadconnected : EventTypeNames::gamepaddisconnected;
-    window()->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)
     : DOMWindowProperty(frame)
     , PlatformEventController(frame ? frame->page() : 0)
     , DOMWindowLifecycleObserver(frame ? frame->localDOMWindow() : 0)
     , m_dispatchOneEventRunner(this, &NavigatorGamepad::dispatchOneEvent)
@@ skipping 106 matching lines @@
         if (connectedGamepadChanged || (!oldWasConnected && newIsConnected)) {
             m_pendingEvents.append(newGamepad);
         }
     }
 
     if (!m_pendingEvents.isEmpty())
         m_dispatchOneEventRunner.runAsync();
 }
 
 } // namespace blink