Move Frame pointer to be held by DOMWindow base class.

third_party/WebKit/Source/core/frame/RemoteDOMWindow.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 "core/frame/RemoteDOMWindow.h"
 
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "core/css/CSSRuleList.h"
 #include "core/css/CSSStyleDeclaration.h"
 #include "core/css/MediaQueryList.h"
 #include "core/dom/Document.h"
 #include "core/frame/RemoteFrameClient.h"
 
 namespace blink {
 
 ExecutionContext* RemoteDOMWindow::getExecutionContext() const {
   return nullptr;
 }
 
 DEFINE_TRACE(RemoteDOMWindow) {
-  visitor->trace(m_frame);
   DOMWindow::trace(visitor);
 }
 
-RemoteFrame* RemoteDOMWindow::frame() const {
-  return m_frame.get();
-}
-
 Screen* RemoteDOMWindow::screen() const {
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 History* RemoteDOMWindow::history() const {
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
@@ skipping 244 matching lines @@
 
 void RemoteDOMWindow::cancelIdleCallback(int id) {
   ASSERT_NOT_REACHED();
 }
 
 CustomElementRegistry* RemoteDOMWindow::customElements(ScriptState*) const {
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
-RemoteDOMWindow::RemoteDOMWindow(RemoteFrame& frame) : m_frame(&frame) {}
+RemoteDOMWindow::RemoteDOMWindow(RemoteFrame& frame) : DOMWindow(frame) {}
 
 void RemoteDOMWindow::frameDetached() {
-  m_frame = nullptr;
+  disconnectFromFrame();
 }
 
 void RemoteDOMWindow::schedulePostMessage(MessageEvent* event,
                                           PassRefPtr<SecurityOrigin> target,
                                           Document* source) {
-  m_frame->client()->forwardPostMessage(event, std::move(target),
+  frame()->client()->forwardPostMessage(event, std::move(target),
                                         source->frame());
 }
 
 }  // namespace blink