Move Frame pointer to be held by DOMWindow base class.

third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 254 matching lines @@
 
   Settings* settings = firstFrame.settings();
   return settings && settings->getJavaScriptCanOpenWindowsAutomatically();
 }
 
 bool LocalDOMWindow::allowPopUp() {
   return frame() && allowPopUp(*frame());
 }
 
 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame)
-    : m_frame(&frame),
+    : DOMWindow(frame),
       m_visualViewport(DOMVisualViewport::create(this)),
       m_unusedPreloadsTimer(
           TaskRunnerHelper::get(TaskType::UnspecedTimer, &frame),
           this,
           &LocalDOMWindow::warnUnusedPreloads),
       m_shouldPrintWhenFinishedLoading(false),
       m_customElements(this, nullptr) {}
 
 void LocalDOMWindow::clearDocument() {
   if (!m_document)
@@ skipping 191 matching lines @@
                     : nullptr;
 }
 
 void LocalDOMWindow::frameDestroyed() {
   for (const auto& domWindowProperty : m_properties)
     domWindowProperty->frameDestroyed();
 
   resetLocation();
   m_properties.clear();
   removeAllEventListeners();
-  m_frame = nullptr;
+  disconnectFromFrame();
 }
 
 void LocalDOMWindow::registerProperty(DOMWindowProperty* property) {
   m_properties.add(property);
 }
 
 void LocalDOMWindow::unregisterProperty(DOMWindowProperty* property) {
   m_properties.remove(property);
 }
 
@@ skipping 1102 matching lines @@
     return targetFrame->domWindow();
   }
 
   WindowFeatures features(windowFeaturesString);
   DOMWindow* newWindow = createWindow(urlString, frameName, features,
                                       *callingWindow, *firstFrame, *frame());
   return features.noopener ? nullptr : newWindow;
 }
 
 DEFINE_TRACE(LocalDOMWindow) {
-  visitor->trace(m_frame);
   visitor->trace(m_document);
   visitor->trace(m_properties);
   visitor->trace(m_screen);
   visitor->trace(m_history);
   visitor->trace(m_locationbar);
   visitor->trace(m_menubar);
   visitor->trace(m_personalbar);
   visitor->trace(m_scrollbars);
   visitor->trace(m_statusbar);
   visitor->trace(m_toolbar);
   visitor->trace(m_navigator);
   visitor->trace(m_media);
   visitor->trace(m_customElements);
   visitor->trace(m_applicationCache);
   visitor->trace(m_eventQueue);
   visitor->trace(m_postMessageTimers);
   visitor->trace(m_visualViewport);
   visitor->trace(m_eventListenerObservers);
   DOMWindow::trace(visitor);
   Supplementable<LocalDOMWindow>::trace(visitor);
 }
 
 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) {
   visitor->traceWrappers(m_customElements);
   DOMWindow::traceWrappers(visitor);
 }
 
-LocalFrame* LocalDOMWindow::frame() const {
-  // If the LocalDOMWindow still has a frame reference, that frame must point
-  // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
-  // where script execution leaks between different LocalDOMWindows.
-  SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this);
-  return m_frame;
-}
-
 }  // namespace blink