Remove DOMWindowProperty from ScreenOrientationCoontroller

third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationControllerImpl.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 "modules/screen_orientation/ScreenOrientationControllerImpl.h"
 
+#include "core/dom/Document.h"
 #include "core/events/Event.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "modules/screen_orientation/ScreenOrientation.h"
 #include "modules/screen_orientation/ScreenOrientationDispatcher.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/ScopedOrientationChangeIndicator.h"
@@ skipping 15 matching lines @@
 
 ScreenOrientationControllerImpl* ScreenOrientationControllerImpl::from(
     LocalFrame& frame) {
   return static_cast<ScreenOrientationControllerImpl*>(
       ScreenOrientationController::from(frame));
 }
 
 ScreenOrientationControllerImpl::ScreenOrientationControllerImpl(
     LocalFrame& frame,
     WebScreenOrientationClient* client)
-    : DOMWindowProperty(&frame),
+    : ContextLifecycleObserver(frame.document()),
       PlatformEventController(frame.page()),
       m_client(client),
       m_dispatchEventTimer(
           this,
           &ScreenOrientationControllerImpl::dispatchEventTimerFired) {}
 
 // Compute the screen orientation using the orientation angle and the screen
 // width / height.
 WebScreenOrientationType ScreenOrientationControllerImpl::computeOrientation(
     const IntRect& rect,
@@ skipping 20 matching lines @@
       return isTallDisplay ? WebScreenOrientationLandscapeSecondary
                            : WebScreenOrientationPortraitPrimary;
     default:
       NOTREACHED();
       return WebScreenOrientationPortraitPrimary;
   }
 }
 
 void ScreenOrientationControllerImpl::updateOrientation() {
   DCHECK(m_orientation);
-  DCHECK(frame());
+
+  if (!frame()) {
+    m_orientation->setType(WebScreenOrientationPortraitPrimary);
+    return;
+  }
+
   DCHECK(frame()->host());
-
   ChromeClient& chromeClient = frame()->host()->chromeClient();
   WebScreenInfo screenInfo = chromeClient.screenInfo();
   WebScreenOrientationType orientationType = screenInfo.orientationType;
   if (orientationType == WebScreenOrientationUndefined) {
     // The embedder could not provide us with an orientation, deduce it
     // ourselves.
     orientationType = computeOrientation(chromeClient.screenInfo().rect,
                                          screenInfo.orientationAngle);
   }
   DCHECK(orientationType != WebScreenOrientationUndefined);
@@ skipping 105 matching lines @@
 }
 
 void ScreenOrientationControllerImpl::unregisterWithDispatcher() {
   ScreenOrientationDispatcher::instance().removeController(this);
 }
 
 bool ScreenOrientationControllerImpl::hasLastData() {
   return true;
 }
 
-void ScreenOrientationControllerImpl::frameDestroyed() {
+void ScreenOrientationControllerImpl::contextDestroyed() {
+  stopUpdating();

[sof, 2016/12/14 14:00:31]

Seems like this is too strong a measure.

   m_client = nullptr;
-  DOMWindowProperty::frameDestroyed();
   m_activeLock = false;
 }
 
 void ScreenOrientationControllerImpl::notifyDispatcher() {
   if (m_orientation && page()->isPageVisible())
     startUpdating();
   else
     stopUpdating();
 }
 
 DEFINE_TRACE(ScreenOrientationControllerImpl) {
   visitor->trace(m_orientation);
-  DOMWindowProperty::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
   Supplement<LocalFrame>::trace(visitor);
   PlatformEventController::trace(visitor);
 }
 
 }  // namespace blink